From nobody Thu Apr 13 09:46:30 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PxvqC39Njz44f6K; Thu, 13 Apr 2023 09:46:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PxvqB684pz3jfS; Thu, 13 Apr 2023 09:46:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681379190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZEOqPCVOjtDd6u6J7BB74e5Iviu5WfhY9sHoTYMeuIQ=; b=krWV/Vb3+u12zY6S/E5a4YOKJyA8/Vjx9/J6JO8Wd5oAivLhHJth+bTWa6GhN1kErmHBdS nYrEqzrDuuE1x/bLePxl+wabyQ/nGb/hK5oA118H/IZ4yDjnnnpN1Q6zIUagkxU4/Xr6V1 XbYnTI3bt6OKZa4WGWDHKUxld175zTcPbJvaKlTltNCr/ioUIDa7ISHjlKhLMjNo5lc7bT Qmdc0/3Mthy8cBtFOzQABro86ozMWQv/0jSD3MQ8Z2Alo7ekHJph7C4FDoj7brrLBPDCLq gpqSfYHaZfk9CZJ62tJQwRD0n7cNFbFmwxy5ZNXISCbDMUrorXGb5VPIfQyRIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681379190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZEOqPCVOjtDd6u6J7BB74e5Iviu5WfhY9sHoTYMeuIQ=; b=X4u6cXBqBd2H34842MkjQqaFMT6qujNsL77oo8n37REDA34g5le89BOb12/5z+rbtnTjce AKm+uk3dXpYnAVBsF3kSgcNC5y+VfMJwgZl5vVH3vkimujwR472krlF4vKKgo0dhHV24+t qGmZaKrhfizh6M45XDSgvBHyWBLY12OOB7J/ZqhLe523D/6aNB6ym5MgoNg0PiLusDtXjA DhK8tgn7IhubT4Anrkf+GtETXMTnh4aCr53DMHz/wRXj0A/bcMiqIIJOHNk6zcH3rUJ8N8 ac0AxOnCZJYmsLwCclA+4zrWKA0Pn11AKwPUHD016CfDraam2VzKBU/Im2mBxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681379190; a=rsa-sha256; cv=none; b=KFsm0IOp7LHB/+URWLvfcjaqy5qZw19JcMzn2cqj7r2t/atIhI4vl5jjnHS1H7FreWF5mt 8y2wCo7B25U+Pm+VGU9QKqiWzLtmRDIpkdSRMHUqI8Yzx0S4/3NnjlppTCeaMcy7oKmN4i eudqmwN/RtMSzq0bc9wv3/JKDzEJiK4lOfPKLTjXqxOAD66HSAa4PLi9ritbHT2VX3I1Br NGbMZcmk5H8WmNaTwrRWEROkOPmZpdC1nuSHLcBPj4fbgY2gwbKsLsOuEkpCovk54WJGqo 5FJdlZJNIIejraOHlRHcGDBSJv0TNn1cw6IDd2IAS4VfheNRapZQw9IOnV3ADQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PxvqB58jPzcyX; Thu, 13 Apr 2023 09:46:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33D9kU5x094502; Thu, 13 Apr 2023 09:46:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33D9kUI8094501; Thu, 13 Apr 2023 09:46:30 GMT (envelope-from git) Date: Thu, 13 Apr 2023 09:46:30 GMT Message-Id: <202304130946.33D9kUI8094501@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 7e591c4f2380 - main - sysutils/xosview: fix memory report List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e591c4f2380c9e680eaa1b060b96e7f6be32eb0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e591c4f2380c9e680eaa1b060b96e7f6be32eb0 commit 7e591c4f2380c9e680eaa1b060b96e7f6be32eb0 Author: Otacílio de Araújo Ramos Neto AuthorDate: 2023-04-12 15:48:37 +0000 Commit: Fernando Apesteguía CommitDate: 2023-04-13 09:41:38 +0000 sysutils/xosview: fix memory report ChangeLog: https://www.freshports.org/sysutils/xosview/ PR: 270733 Reported by: otaciliodearaujo@gmail.com (maintainer) --- sysutils/xosview/Makefile | 2 +- sysutils/xosview/files/patch-bsd_kernel.cc | 38 ++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index af04b4f31e34..9e7066ecafff 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,6 +1,6 @@ PORTNAME= xosview DISTVERSION= 1.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= otaciliodearaujo@gmail.com diff --git a/sysutils/xosview/files/patch-bsd_kernel.cc b/sysutils/xosview/files/patch-bsd_kernel.cc index 4fb5fe787e4f..a008568f689e 100644 --- a/sysutils/xosview/files/patch-bsd_kernel.cc +++ b/sysutils/xosview/files/patch-bsd_kernel.cc @@ -1,4 +1,4 @@ ---- bsd/kernel.cc.orig 2021-05-16 03:48:22 UTC +--- bsd/kernel.cc.orig 2020-07-11 12:10:34 UTC +++ bsd/kernel.cc @@ -48,8 +48,10 @@ static int maxcpus = 1; #include @@ -11,7 +11,35 @@ #if defined(XOSVIEW_NETBSD) #include -@@ -1558,6 +1560,7 @@ BSDHasBattery() { +@@ -338,15 +340,14 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo) + u_int v_swappgsout; + } vm; + #if defined(XOSVIEW_FREEBSD) +- size_t size = sizeof(unsigned int); ++ size_t size = sizeof(u_int); ++ bzero(&vm, sizeof(vm)); + #define GET_VM_STATS(name) \ + sysctlbyname("vm.stats.vm." #name, &vm.name, &size, NULL, 0) + 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); +@@ -368,9 +369,7 @@ 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; +-#if __FreeBSD_version < 1200017 + meminfo[3] = (uint64_t)vm.v_cache_count * vm.v_page_size; +-#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; +@@ -1558,6 +1557,7 @@ BSDHasBattery() { #else // XOSVIEW_FREEBSD || XOSVIEW_DFBSD int fd; if ( (fd = open(ACPIDEV, O_RDONLY)) == -1 ) { @@ -19,7 +47,7 @@ // No ACPI -> try APM if ( (fd = open(APMDEV, O_RDONLY)) == -1 ) return false; -@@ -1569,6 +1572,9 @@ BSDHasBattery() { +@@ -1569,6 +1569,9 @@ BSDHasBattery() { if (aip.ai_batt_stat == 0xff || aip.ai_batt_life == 0xff) return false; return true; @@ -29,7 +57,7 @@ } union acpi_battery_ioctl_arg battio; -@@ -1717,6 +1723,7 @@ BSDGetBatteryInfo(int *remaining, unsigned int *state) +@@ -1717,6 +1720,7 @@ BSDGetBatteryInfo(int *remaining, unsigned int *state) /* Adapted from acpiconf and apm. */ int fd; if ( (fd = open(ACPIDEV, O_RDONLY)) == -1 ) { @@ -37,7 +65,7 @@ // No ACPI -> try APM if ( (fd = open(APMDEV, O_RDONLY)) == -1 ) err(EX_OSFILE, "could not open %s or %s", ACPIDEV, APMDEV); -@@ -1740,6 +1747,10 @@ BSDGetBatteryInfo(int *remaining, unsigned int *state) +@@ -1740,6 +1744,10 @@ BSDGetBatteryInfo(int *remaining, unsigned int *state) else *state = XOSVIEW_BATT_NONE; return;