diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-12-24 12:32:19 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-12-24 12:32:19 +0000 |
| commit | 6725a6d15793ba6e4a3974fd69160552dc8ff803 (patch) | |
| tree | 028ed209fae09402efe5038b2e90db6c99e5b0e4 | |
| parent | 1c1903db2e5084962f079f932bf310daa4223cb9 (diff) | |
Notes
| -rw-r--r-- | sysutils/xosview/files/patch-bsd-kernel.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sysutils/xosview/files/patch-bsd-kernel.cc b/sysutils/xosview/files/patch-bsd-kernel.cc index 4519fe24d210..578f8bffa407 100644 --- a/sysutils/xosview/files/patch-bsd-kernel.cc +++ b/sysutils/xosview/files/patch-bsd-kernel.cc @@ -83,7 +83,7 @@ #endif { NULL } }; -@@ -338,7 +323,21 @@ BSDGetPageStats(uint64_t *meminfo, uint6 +@@ -338,7 +323,23 @@ BSDGetPageStats(uint64_t *meminfo, uint6 #else /* HAVE_UVM */ struct vmmeter vm; #if defined(XOSVIEW_FREEBSD) @@ -95,7 +95,9 @@ + GET_VM_STATS(v_active_count); + GET_VM_STATS(v_inactive_count); + GET_VM_STATS(v_wire_count); ++#if __FreeBSD_version < 1200017 + GET_VM_STATS(v_cache_count); ++#endif + GET_VM_STATS(v_free_count); + GET_VM_STATS(v_page_size); + GET_VM_STATS(v_vnodepgsin); @@ -106,7 +108,19 @@ #else /* XOSVIEW_DFBSD */ struct vmstats vms; size_t size = sizeof(vms); -@@ -468,99 +467,37 @@ BSDGetCPUTimes(uint64_t *timeArray, unsi +@@ -353,7 +354,11 @@ BSDGetPageStats(uint64_t *meminfo, uint6 + meminfo[0] = (uint64_t)vm.v_active_count * vm.v_page_size; + meminfo[1] = (uint64_t)vm.v_inactive_count * vm.v_page_size; + meminfo[2] = (uint64_t)vm.v_wire_count * vm.v_page_size; ++#if __FreeBSD_version < 1200017 + meminfo[3] = (uint64_t)vm.v_cache_count * vm.v_page_size; ++#else ++ meminfo[3] = 0; ++#endif + meminfo[4] = (uint64_t)vm.v_free_count * vm.v_page_size; + #else /* XOSVIEW_DFBSD */ + meminfo[0] = (uint64_t)vms.v_active_count * vms.v_page_size; +@@ -468,99 +473,37 @@ BSDGetCPUTimes(uint64_t *timeArray, unsi int BSDNetInit() { OpenKDIfNeeded(); |