From 6918396adb8b018d6b67ebe38c9a7759285f66c2 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Sat, 12 Jan 2013 16:23:09 +0100
Subject: Report VM cache size in meminfo

* rootdir.c: Include <mach/gnumach.h> and <mach/vm_cache_statistics.h>.
(rootdir_gc_meminfo): Call vm_cache_statistics and return the VM cache size.
---
 rootdir.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rootdir.c b/rootdir.c
index 1fa71b03..31e2d8c6 100644
--- a/rootdir.c
+++ b/rootdir.c
@@ -17,8 +17,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
+#include <mach/gnumach.h>
 #include <mach/vm_param.h>
 #include <mach/vm_statistics.h>
+#include <mach/vm_cache_statistics.h>
 #include <mach/default_pager.h>
 #include <hurd/paths.h>
 #include <stdio.h>
@@ -263,6 +265,7 @@ rootdir_gc_meminfo (void *hook, char **contents, ssize_t *contents_len)
   host_basic_info_data_t hbi;
   mach_msg_type_number_t cnt;
   struct vm_statistics vmstats;
+  struct vm_cache_statistics cache_stats;
   default_pager_info_t swap;
   error_t err;
 
@@ -270,6 +273,10 @@ rootdir_gc_meminfo (void *hook, char **contents, ssize_t *contents_len)
   if (err)
     return EIO;
 
+  err = vm_cache_statistics (mach_task_self (), &cache_stats);
+  if (err)
+    return EIO;
+
   cnt = HOST_BASIC_INFO_COUNT;
   err = host_info (mach_host_self (), HOST_BASIC_INFO, (host_info_t) &hbi, &cnt);
   if (err)
@@ -294,7 +301,7 @@ rootdir_gc_meminfo (void *hook, char **contents, ssize_t *contents_len)
       (long unsigned) hbi.memory_size / 1024,
       (long unsigned) vmstats.free_count * PAGE_SIZE / 1024,
       0,
-      0,
+      (long unsigned) cache_stats.cache_count * PAGE_SIZE / 1024,
       (long unsigned) vmstats.active_count * PAGE_SIZE / 1024,
       (long unsigned) vmstats.inactive_count * PAGE_SIZE / 1024,
       (long unsigned) vmstats.wire_count * PAGE_SIZE / 1024,
-- 
cgit v1.2.3


From 011429a837aabd31149f5641545b9d05a042d144 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 24 Feb 2013 00:59:42 +0100
Subject: Fix getting parameter for set_status

* libmachdev/net.c (device_set_status): Use count as number of parameter,
not number of bytes. Take status as integer, not short.
---
 libmachdev/net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libmachdev/net.c b/libmachdev/net.c
index 4b4cfe7c..501c9bb7 100644
--- a/libmachdev/net.c
+++ b/libmachdev/net.c
@@ -583,10 +583,10 @@ device_set_status(void *d, dev_flavor_t flavor, dev_status_t status,
 {
   if (flavor == NET_FLAGS)
     {
-      if (count != sizeof(short))
+      if (count != 1)
         return D_INVALID_SIZE;
 
-      short flags = *(short *) status;
+      int flags = *(int *) status;
       struct net_data *net = (struct net_data *) d;
 
       dev_change_flags (net->dev, flags);
-- 
cgit v1.2.3