Date: Sat, 24 Dec 2016 12:32:19 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429333 - head/sysutils/xosview/files Message-ID: <201612241232.uBOCWJw7015584@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Dec 24 12:32:19 2016 New Revision: 429333 URL: https://svnweb.freebsd.org/changeset/ports/429333 Log: Fix build with __FreeBSD_version >= 1200017 Adapt to base r309017, which removed v_cache_cout from vmmeter. PR: 215152 Submitted by: otacilio.neto@bsd.com.br (maintainer) 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 Sat Dec 24 12:30:10 2016 (r429332) +++ head/sysutils/xosview/files/patch-bsd-kernel.cc Sat Dec 24 12:32:19 2016 (r429333) @@ -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();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612241232.uBOCWJw7015584>