upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

systat/top: Update ZFS sysctl names

Browse source 
Some of ARC statistic sysctls changed years ago, but those tools
are still using legacy shims, that are going to be removed.

Approved by:    re (cperciva)

(cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf)
(cherry picked from commit f23326ff2c7cad9579061291b6de7feb5ea7302a)
This commit is contained in:
Alexander Motin 2025-05-25 14:23:54 -04:00
parent 4d66e0f884
commit 93839cddbd
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr.bin/systat/main.c
View file

@ -304,9 +304,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]);

6
usr.bin/top/machine.c
View file

@ -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);