diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2018-12-31 17:04:34 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2018-12-31 17:04:34 +0000 |
| commit | 4d62b9f761e6dcb8473d246f28d2e66ff19b905c (patch) | |
| tree | a34af896fc7405ecda3483eb722b3a8016366edb /sysutils/xosview/files/patch-bsd_kernel.cc | |
| parent | Update to 4.0.1 (diff) | |
sysutils/xosview: update to 1.21
No info for this new release.
While here:
* Remove BROKEN_* since this builds fine in 12 or greater.
* Simplify patch since some changes where merged upstream:
https://github.com/hills/xosview/pull/11
PR: 234526
Reported by: freebsd@oldach.net
Diffstat (limited to 'sysutils/xosview/files/patch-bsd_kernel.cc')
| -rw-r--r-- | sysutils/xosview/files/patch-bsd_kernel.cc | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/sysutils/xosview/files/patch-bsd_kernel.cc b/sysutils/xosview/files/patch-bsd_kernel.cc index 389fbd97fb58..4b7902a10357 100644 --- a/sysutils/xosview/files/patch-bsd_kernel.cc +++ b/sysutils/xosview/files/patch-bsd_kernel.cc @@ -1,6 +1,6 @@ ---- bsd/kernel.cc.orig 2017-11-04 15:05:59 UTC +--- bsd/kernel.cc.orig 2018-09-12 13:52:23 UTC +++ bsd/kernel.cc -@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVM +@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVMEXP2 }; static int mib_uvm[2] = { CTL_VM, VM_UVMEXP }; #endif #else @@ -10,31 +10,7 @@ #include <sys/vmmeter.h> #endif -@@ -320,7 +323,22 @@ BSDGetPageStats(uint64_t *meminfo, uint6 - pageinfo[1] = (uint64_t)uvm.pgswapout; - } - #else /* HAVE_UVM */ -- struct vmmeter vm; -+ /* -+ * Temporal patch from: -+ * https://github.com/hills/xosview/commit/0b4861c9fed2dc8450edf2dff7988ebd784a520b.patch -+ */ -+ struct vmmeter_fbsd { -+ u_int v_active_count; -+ u_int v_inactive_count; -+ u_int v_wire_count; -+ u_int v_cache_count; -+ u_int v_free_count; -+ u_int v_page_size; -+ u_int v_vnodepgsin; -+ u_int v_vnodepgsout; -+ u_int v_swappgsin; -+ u_int v_swappgsout; -+ } vm; - #if defined(XOSVIEW_FREEBSD) - size_t size = sizeof(unsigned int); - #define GET_VM_STATS(name) \ -@@ -328,7 +346,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6 +@@ -339,7 +342,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo) GET_VM_STATS(v_active_count); GET_VM_STATS(v_inactive_count); GET_VM_STATS(v_wire_count); @@ -44,7 +20,7 @@ GET_VM_STATS(v_free_count); GET_VM_STATS(v_page_size); GET_VM_STATS(v_vnodepgsin); -@@ -350,7 +370,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6 +@@ -361,7 +366,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo) 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; @@ -54,12 +30,3 @@ 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; -@@ -654,7 +676,7 @@ DevStat_Init(void) { - - uint64_t - DevStat_Get(uint64_t *read_bytes, uint64_t *write_bytes) { -- register int dn; -+ int dn; - long double busy_seconds; - uint64_t reads, writes, total_bytes = 0; - struct devinfo *tmp_dinfo; |