From nobody Sun May 25 18:30:20 2025 X-Original-To: dev-commits-src-main@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 4b56rr3VRtz5wbsw; Sun, 25 May 2025 18:30:20 +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 4b56rr2vJMz4CtP; Sun, 25 May 2025 18:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748197820; 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=nWsOPoO+BXuexEWlDYDbsbVv76640k9300iSJdD1gJk=; b=tlJmFbiLTzNPIt6PnZxeqo5qNIqo+o/jL6gkzLTCPIDdWaX8sbBqCUG8k81ZzKqMX/TG2J dsAHil42tyN1QMqFDTj1LPYMGEKeNYWoCMS/IYeOxHUts04cw98qkCXPezSLITkD6NW69o n/apZBgNe9L41/jU+XcZrzR9OVj3FPHhE8UD3pD1RAYEgnFOyj6AR4VXs29x7QCRl0DO4H /qkjUkLQZdWZROXdu9XINJ2tIQHMz9rHvhoKam7V/POK9f/i2/5Fk43H2aVsPkGHZX8NeK tQ0dR1yC+nwrWTeu1Ph9Vv4aV2fYGxYU1CBntvxFZ9qkqj2Y9G3ayvMKvIE/8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748197820; 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=nWsOPoO+BXuexEWlDYDbsbVv76640k9300iSJdD1gJk=; b=Dow/KiOtRDCr6Rni2NTDJfI6TEBDWvduDGnqwyZSGu53IiAUCOSBw0CZ7GoPH2vofHiGv0 v6R+843zkAm/kHmq1W2iv314s3PBgRufHsfxVEOn3So+mC4UEsV8b+gbmvviSPT9SWkYcw 8ZUyNNmcxYv1QRIG2hct9KhqoueeHlD7/5R1OeQL1seqaUPF/Hp3O+hSr1/4OkYi0qUR7o ARRS9IUEYLJYKC4M5h+3mK5L5LfCwI7xfoxkgxh5U9xlAAI20PNylRKvYgHy899P5ER1QE q0kSODpMrReXw5S7miZCfED6UWMeQxUizn9f5naWoUo9jQiRXy0CXNP6dnL9fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748197820; a=rsa-sha256; cv=none; b=p4P3eipmMazj/ThjLbiOhFJAwZp6eEgUhgI54PlX20Kt+XYDgYQ1rnhWgKfyxpVQRfHKzt 6DSuou7UpddX7AWArJq/Svrs9GS+DWhv22yvy1SHYmUW2gm1TWVPHBBmyzg8i4oVkNIjUp GpMdOtCs0clIwQgDwZ4mzfu3sdH0ylvFvJVCH0yFqyt83eTKUtzpHvuts5PzEVa8CmW8O4 uwTKYPvnBuA5ZxF80Sh9WkVCqk6+PKtItf0DFDw0iBHbiB3paKI1iuB71u6sj3WZErKIP0 aUTCrrDhafnog429sxeE/rttlbHreIX6hdiroFgF3Ogwv4++XYNOuCst5Osh2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b56rr20F2zZ1w; Sun, 25 May 2025 18:30:20 +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 54PIUKnH078653; Sun, 25 May 2025 18:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54PIUKtd078650; Sun, 25 May 2025 18:30:20 GMT (envelope-from git) Date: Sun, 25 May 2025 18:30:20 GMT Message-Id: <202505251830.54PIUKtd078650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 8aad1e6148d3 - main - systat/top: Update ZFS sysctl names List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8aad1e6148d3389df100bb0391e2d3a909f26ecf Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=8aad1e6148d3389df100bb0391e2d3a909f26ecf commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf Author: Alexander Motin AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin CommitDate: 2025-05-25 18:23:54 +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 --- 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 33fc187e1ab6..dbb82ebbb1c0 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -301,9 +301,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);