From nobody Wed May 28 00:28:55 2025 X-Original-To: dev-commits-src-branches@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 4b6Vjh1BvBz5wcbK; Wed, 28 May 2025 00:28:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Vjg48qbz3f9p; Wed, 28 May 2025 00:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748392135; 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=A7GW0L23IwIS9Oj2W/i1nTDX5LH92WZF36bU+azgLBY=; b=WFGjUZ27sZXIXwZ6tY31hfOypPMXw1WoLeBzG7r4uZ0p5N4jCP/As8sreDlAoPnoDQEJWP Mb/sto3rzUvfuOcaGTlNKInCvadzjFrDSh51qbB7QYz9Gp8nd/5r/y2Tim2KpdJ9GOrUza kgWpqslvi3n6HZb63H0QvLCHwxh49EJfxCLY400Gf9ID78q6TTDilGnK/x+CYWeM9L7IRt NbvLC9ebq1ATBHQ+tlql1SNGNaSfwIwWILL5dI78iY+fU/ZqgFCPYp4fuffDEVjcbXg9Bn h/sIsJtPFbSjAbRBM3Z44MPOecYeNQVds0wtkAjc0z3h5+7nlodsAAv1AiV6/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748392135; a=rsa-sha256; cv=none; b=rH2wI3X0MdEMRProE8KSWbtfSneGaQ/eRt7PjGHhqBSHxm89baor6y5vaXHpc47gQWZgmF lpnfB7PdsQTPzvfG0EyygUwFL/fHFiBDwtbnhLXKk4qAyUl85RRK8fU1FoFrRuRNTIk06e imgzzoYtuGNFrBinPnFPgvFnoTUZA8o89zZigGUgSOFWA0MX+sJwwV+V3H7va5oFhE7pYt nODrJ2XQPY0COaOKq0TR3RRFESJK5q8rAt77f8a5eleO+mKUixVvIStqO/SVn0woROyte5 fpVRo9Hybbo0tepdK04VTVap1qazeCg9dJ08aM2iD3THiq8U4ALlsTRQ/67VLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748392135; 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=A7GW0L23IwIS9Oj2W/i1nTDX5LH92WZF36bU+azgLBY=; b=hHtkIQ/DleKYgcSjfvpCDqV2u0yF7ejo8x25OjCH6KmEAONiS60Y4k5xtIsDUCCS82CZmF 6LsaKS+GQ30CWeUPmwpcLxgyKe+b6T4e8+Olnd46syRz4SssfdzpWfi2j6vI4BbNlqnXwG hi65WHs63/kg9oZf8z2s3dHi7E0irf1DYF1FS5Y0ymKKt9VPdcoIObnBWCipyPfQqNg7qD 6V3OJ/AqPe4BFPd2dIKOf9ChOSZ1wumzI94hQkuFbArW7csNL16z/WynWLS8V5/Bzb+fr8 2N3DXnTVap36qPzbUqLmNsGtHfJ6S3ILPp7hTytHEIRRwLv3cf5uvxMi8wwnxQ== 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 4b6Vjg3NppzRm; Wed, 28 May 2025 00:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54S0StnM036888; Wed, 28 May 2025 00:28:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S0StOk036885; Wed, 28 May 2025 00:28:55 GMT (envelope-from git) Date: Wed, 28 May 2025 00:28:55 GMT Message-Id: <202505280028.54S0StOk036885@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: c92ffde748d5 - stable/13 - systat/top: Update ZFS sysctl names List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c92ffde748d5fa397964fbc4c1f6766858aeb337 Auto-Submitted: auto-generated The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=c92ffde748d5fa397964fbc4c1f6766858aeb337 commit c92ffde748d5fa397964fbc4c1f6766858aeb337 Author: Alexander Motin AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin CommitDate: 2025-05-28 00:27:55 +0000 systat/top: Update ZFS sysctl names Some of ARC statistic sysctls changed years ago, but those tools are still using legacy shims, that are going to be removed. MFC after: 3 days (cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf) --- usr.bin/systat/main.c | 6 +++--- usr.bin/top/machine.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index e6fc79b7ba59..be580aa2794e 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -296,9 +296,9 @@ display(void) size_t size = sizeof(arc[0]); if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc[0], &size, NULL, 0) == 0 ) { - GETSYSCTL("vfs.zfs.mfu_size", arc[1]); - GETSYSCTL("vfs.zfs.mru_size", arc[2]); - GETSYSCTL("vfs.zfs.anon_size", arc[3]); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc[1]); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc[2]); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc[3]); GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); GETSYSCTL("kstat.zfs.misc.arcstats.bonus_size", arc[6]); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index a76d77a80ce4..07a7119ad0c2 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -537,11 +537,11 @@ get_system_info(struct system_info *si) if (arc_enabled) { GETSYSCTL("kstat.zfs.misc.arcstats.size", arc_stat); arc_stats[0] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mfu_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc_stat); arc_stats[1] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mru_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc_stat); arc_stats[2] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.anon_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc_stat); arc_stats[3] = arc_stat >> 10; GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc_stat); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc_stat2);