Date: Fri, 24 Aug 2018 18:42:44 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477978 - head/sysutils/xosview/files Message-ID: <201808241842.w7OIgid9029350@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Fri Aug 24 18:42:44 2018 New Revision: 477978 URL: https://svnweb.freebsd.org/changeset/ports/477978 Log: sysutils/xosview: unbreak in 12 Broken due to changes in sys/vmmeter.h Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D16747 Modified: head/sysutils/xosview/files/patch-bsd_kernel.cc Modified: head/sysutils/xosview/files/patch-bsd_kernel.cc ============================================================================== --- head/sysutils/xosview/files/patch-bsd_kernel.cc Fri Aug 24 18:31:51 2018 (r477977) +++ head/sysutils/xosview/files/patch-bsd_kernel.cc Fri Aug 24 18:42:44 2018 (r477978) @@ -10,7 +10,31 @@ #include <sys/vmmeter.h> #endif -@@ -328,7 +331,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6 +@@ -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 GET_VM_STATS(v_active_count); GET_VM_STATS(v_inactive_count); GET_VM_STATS(v_wire_count); @@ -20,7 +44,7 @@ GET_VM_STATS(v_free_count); GET_VM_STATS(v_page_size); GET_VM_STATS(v_vnodepgsin); -@@ -350,7 +355,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6 +@@ -350,7 +370,9 @@ 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; @@ -30,7 +54,7 @@ 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 +661,7 @@ DevStat_Init(void) { +@@ -654,7 +676,7 @@ DevStat_Init(void) { uint64_t DevStat_Get(uint64_t *read_bytes, uint64_t *write_bytes) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808241842.w7OIgid9029350>