diff options
| author |   guenther <guenther@openbsd.org> | 2019-11-28 16:27:25 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2019-11-28 16:27:25 +0000 |
| commit | 68acdce2ce14b5d52a5ee2f45dad5ea9199c1c0b (patch) | |
| tree | 2c16cc66ff43968c3a9b41523abc3505cb76f497 | |
| parent | Delete km_mapblocks from kmemstats and its always-zero column from the ddb (diff) | |
| download | wireguard-openbsd-68acdce2ce14b5d52a5ee2f45dad5ea9199c1c0b.tar.xz wireguard-openbsd-68acdce2ce14b5d52a5ee2f45dad5ea9199c1c0b.zip | |
ks_mapblocks is gone
| -rw-r--r-- | sbin/sysctl/sysctl.c | 6 | ||||
| -rw-r--r-- | usr.bin/systat/malloc.c | 3 | ||||
| -rw-r--r-- | usr.bin/vmstat/vmstat.c | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 551a1dbe1fb..2611aab2a42 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.248 2019/10/29 04:20:36 dlg Exp $ */ +/* $OpenBSD: sysctl.c,v 1.249 2019/11/28 16:27:25 guenther Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -884,11 +884,11 @@ parse(char *string, int flags) if (!nflag) (void)printf("%s%s", string, equ); (void)printf("(inuse = %ld, calls = %ld, memuse = %ldK, " - "limblocks = %d, mapblocks = %d, maxused = %ldK, " + "limblocks = %d, maxused = %ldK, " "limit = %ldK, spare = %ld, sizes = (", km->ks_inuse, km->ks_calls, (km->ks_memuse + 1023) / 1024, km->ks_limblocks, - km->ks_mapblocks, (km->ks_maxused + 1023) / 1024, + (km->ks_maxused + 1023) / 1024, (km->ks_limit + 1023) / 1024, km->ks_spare); for (j = 1 << MINBUCKET; j < 1 << (MINBUCKET + 16); j <<= 1) { if ((km->ks_size & j ) == 0) diff --git a/usr.bin/systat/malloc.c b/usr.bin/systat/malloc.c index 60e8325336a..c25373d8aff 100644 --- a/usr.bin/systat/malloc.c +++ b/usr.bin/systat/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.4 2019/06/28 13:35:04 deraadt Exp $ */ +/* $OpenBSD: malloc.c,v 1.5 2019/11/28 16:27:25 guenther Exp $ */ /* * Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org> * @@ -394,7 +394,6 @@ showtype(int k) print_fld_size(FLD_TYPE_LIMIT, t->stats.ks_limit); print_fld_size(FLD_TYPE_REQUESTS, t->stats.ks_calls); print_fld_size(FLD_TYPE_TLIMIT, t->stats.ks_limblocks); - print_fld_size(FLD_TYPE_KLIMIT, t->stats.ks_mapblocks); print_fld_str(FLD_TYPE_SIZES, t->buckets); end_line(); diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 742ce0022f1..da88fe0e095 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.149 2019/10/14 19:22:17 deraadt Exp $ */ +/* $OpenBSD: vmstat.c,v 1.150 2019/11/28 16:27:26 guenther Exp $ */ /* * Copyright (c) 1980, 1986, 1991, 1993 @@ -868,16 +868,16 @@ domem(void) (void)printf( "\nMemory statistics by type Type Kern\n"); (void)printf( -" Type InUse MemUse HighUse Limit Requests Limit Limit Size(s)\n"); +" Type InUse MemUse HighUse Limit Requests Limit Size(s)\n"); for (i = 0, ks = &kmemstats[0]; i < M_LAST; i++, ks++) { if (ks->ks_calls == 0) continue; - (void)printf("%14s%6ld%6ldK%7ldK%6ldK%9ld%5u%6u", + (void)printf("%14s%6ld%6ldK%7ldK%6ldK%9ld%5u", kmemnames[i] ? kmemnames[i] : "undefined", ks->ks_inuse, (ks->ks_memuse + 1023) / 1024, (ks->ks_maxused + 1023) / 1024, (ks->ks_limit + 1023) / 1024, ks->ks_calls, - ks->ks_limblocks, ks->ks_mapblocks); + ks->ks_limblocks); first = 1; for (j = 1 << MINBUCKET; j < 1 << (MINBUCKET + 16); j <<= 1) { if ((ks->ks_size & j) == 0) |