From owner-svn-ports-all@freebsd.org Sat Dec 24 12:32:21 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 083F3C8EA61; Sat, 24 Dec 2016 12:32:21 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B176A944; Sat, 24 Dec 2016 12:32:20 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBOCWJnZ015585; Sat, 24 Dec 2016 12:32:19 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBOCWJw7015584; Sat, 24 Dec 2016 12:32:19 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201612241232.uBOCWJw7015584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 24 Dec 2016 12:32:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429333 - head/sysutils/xosview/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Dec 2016 12:32:21 -0000 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();