From owner-svn-ports-head@freebsd.org Fri Aug 24 18:42:45 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 477E810915B7; Fri, 24 Aug 2018 18:42:45 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EE95571FA5; Fri, 24 Aug 2018 18:42:44 +0000 (UTC) (envelope-from fernape@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CFC6614E64; Fri, 24 Aug 2018 18:42:44 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7OIgixl029351; Fri, 24 Aug 2018 18:42:44 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7OIgid9029350; Fri, 24 Aug 2018 18:42:44 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <201808241842.w7OIgid9029350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Fri, 24 Aug 2018 18:42:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477978 - head/sysutils/xosview/files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: head/sysutils/xosview/files X-SVN-Commit-Revision: 477978 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Aug 2018 18:42:45 -0000 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 #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) {