diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-25 23:09:27 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-25 23:09:27 +0000 |
| commit | dc2a7e0310f420dac56957d5e5b3deb906da3cc8 (patch) | |
| tree | e292239b44027fe1c8a4c92d44cd9a56b765eb80 /procfs/rootdir.c | |
| parent | 0da142d54d351f490de8f3edaa07feb341d92da8 (diff) | |
| parent | aab424abe8eea59e25a498e25fc3ee797a96bf29 (diff) | |
Merge branch 'procfs-jkoenig-moved' into upstream-merged
Diffstat (limited to 'procfs/rootdir.c')
| -rw-r--r-- | procfs/rootdir.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/procfs/rootdir.c b/procfs/rootdir.c index 1fa71b03..31e2d8c6 100644 --- a/procfs/rootdir.c +++ b/procfs/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, |