talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top: Avoid printing a blank line when the ZFS ARC is empty 

PR:		275994
MFC after:	2 weeks
This commit is contained in:
Mark Johnston 2024-01-11 09:58:31 -05:00
parent cb350ba7bf
commit 1f62718d8b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/top/machine.c
View File

@ -293,17 +293,27 @@ machine_init(struct statics *statics)
size = sizeof(carc_en);
if (arc_enabled &&
sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size,
NULL, 0) == 0 && carc_en == 1)
carc_enabled = 1;
NULL, 0) == 0 && carc_en == 1) {
uint64_t uncomp_sz;
/*
* Don't report compression stats if no data is in the ARC.
* Otherwise, we end up printing a blank line.
*/
size = sizeof(uncomp_sz);
if (sysctlbyname("kstat.zfs.misc.arcstats.uncompressed_size",
&uncomp_sz, &size, NULL, 0) == 0 && uncomp_sz != 0)
carc_enabled = 1;
}
kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open");
if (kd == NULL)
return (-1);
size = sizeof(nswapdev);
if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL,
0) == 0 && nswapdev != 0)
has_swap = 1;
if (sysctlbyname("vm.nswapdev", &nswapdev, &size, NULL, 0) == 0 &&
nswapdev != 0)
has_swap = 1;
GETSYSCTL("kern.ccpu", ccpu);