diff options
| author | Visa Hankala <visa@cvs.openbsd.org> | 2022-07-26 14:49:14 +0000 |
|---|---|---|
| committer | Visa Hankala <visa@cvs.openbsd.org> | 2022-07-26 14:49:14 +0000 |
| commit | f2a64250570d7ebf5cbd29706a356fa443580451 (patch) | |
| tree | ae8ffe4a3917ceaea8500c5b71a82bf04febae02 | |
| parent | 59478e0b2f531e97853e9e7e1cd85a60e1a07a30 (diff) | |
Remove "select collisions" output from vmstat(8).
While here, use NULL instead of "" as name list terminator.
OK mpi@ cheloha@
| -rw-r--r-- | usr.bin/vmstat/vmstat.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 17c8f061a8b..9b5c12c3989 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1,5 +1,5 @@ /* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */ -/* $OpenBSD: vmstat.c,v 1.153 2022/02/22 17:35:01 deraadt Exp $ */ +/* $OpenBSD: vmstat.c,v 1.154 2022/07/26 14:49:13 visa Exp $ */ /* * Copyright (c) 1980, 1986, 1991, 1993 @@ -72,13 +72,11 @@ struct nlist namelist[] = { { "_bucket" }, #define X_FORKSTAT 5 /* sysctl */ { "_forkstat" }, -#define X_NSELCOLL 6 /* sysctl */ - { "_nselcoll" }, -#define X_POOLHEAD 7 /* sysctl */ +#define X_POOLHEAD 6 /* sysctl */ { "_pool_head" }, -#define X_NAPTIME 8 +#define X_NAPTIME 7 { "_naptime" }, - { "" }, + { NULL }, }; /* Objects defined in dkstats.c */ @@ -485,7 +483,7 @@ void dosum(void) { struct nchstats nchstats; - int mib[2], nselcoll; + int mib[2]; long long nchtotal; size_t size; @@ -571,19 +569,6 @@ dosum(void) pct(nchstats.ncs_badhits, nchtotal), pct(nchstats.ncs_falsehits, nchtotal), pct(nchstats.ncs_long, nchtotal)); - - if (nlistf == NULL && memf == NULL) { - size = sizeof(nselcoll); - mib[0] = CTL_KERN; - mib[1] = KERN_NSELCOLL; - if (sysctl(mib, 2, &nselcoll, &size, NULL, 0) == -1) { - warn("could not read kern.nselcoll"); - nselcoll = 0; - } - } else { - kread(X_NSELCOLL, &nselcoll, sizeof(nselcoll)); - } - (void)printf("%11d select collisions\n", nselcoll); } void |