mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Rename some unused fields in struct uvmexp to

Browse Source 
unusedNN.

Missing man page bits pointed out by
jmc@. Ports source scan by sthen@.

ok deraadt@ guenther@
This commit is contained in:
krw 2018-06-19 22:35:07 +00:00
parent 1371d37603
commit 65a0562901
6 changed files with 50 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
share/man/man9/uvm.9
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: uvm.9,v 1.68 2018/05/01 12:55:04 stefan Exp $
.\" $OpenBSD: uvm.9,v 1.69 2018/06/19 22:35:07 krw Exp $
.\" $NetBSD: uvm.9,v 1.14 2000/06/29 06:08:44 mrg Exp $
.\"
.\" Copyright (c) 1998 Matthew R. Green
@ -30,7 +30,7 @@
.\" XXX this manual sets nS to 1 or 0 in the description, to obtain
.\" synopsis-like function prototypes. any better way?
.\"
.Dd $Mdocdate: May 1 2018 $
.Dd $Mdocdate: June 19 2018 $
.Dt UVM_INIT 9
.Os
.Sh NAME
@ -932,9 +932,9 @@ int wired; /* number of wired pages */
int zeropages; /* number of zero'd pages */
int reserve_pagedaemon; /* number of pages reserved for pagedaemon */
int reserve_kernel; /* number of pages reserved for kernel */
int anonpages; /* number of pages used by anon pagers */
int vnodepages; /* number of pages used by vnode page cache */
int vtextpages; /* number of pages used by vtext vnodes */
int unused01; /* formerly anonpages */
int vnodepages; /* XXX # of pages used by vnode page cache */
int vtextpages; /* XXX # of pages used by vtext vnodes */
/* pageout params */
int freemin; /* min number of free pages */
@ -954,9 +954,9 @@ int swpages; /* number of PAGE_SIZE'ed swap pages */
int swpginuse; /* number of swap pages in use */
int swpgonly; /* number of swap pages in use, not also in RAM */
int nswget; /* number of times fault calls uvm_swap_get() */
int nanon; /* number total of anon's in system */
int nanonneeded;/* number of anons currently needed */
int nfreeanon; /* number of free anon's */
int nanon; /* XXX number total of anon's in system */
int unused05; /* formerly nanonneeded */
int unused06; /* formerly nfreeanon */
/* stat counters */
int faults; /* page fault count */
@ -967,23 +967,23 @@ int softs; /* software interrupt count */
int syscalls; /* system calls */
int pageins; /* pagein operation count */
/* pageouts are in pdpageouts below */
int swapins; /* swapins */
int swapouts; /* swapouts */
int unused07; /* formerly obsolete_swapins */
int unused08; /* formerly obsolete_swapouts */
int pgswapin; /* pages swapped in */
int pgswapout; /* pages swapped out */
int forks; /* forks */
int forks; /* forks */
int forks_ppwait; /* forks where parent waits */
int forks_sharevm; /* forks where vmspace is shared */
int pga_zerohit; /* pagealloc where zero wanted and zero
was available */
was available */
int pga_zeromiss; /* pagealloc where zero wanted and zero
not available */
int zeroaborts; /* number of times page zeroing was
aborted */
not available */
int unused09; /* formerly zeroaborts */
/* fault subcounters */
int fltnoram; /* number of times fault was out of ram */
int fltnoanon; /* number of times fault was out of anons */
int fltnoamap; /* number of times fault was out of amap chunks */
int fltpgwait; /* number of times fault had to wait on a page */
int fltpgrele; /* number of times fault found a released page */
int fltrelck; /* number of times fault relock called */
@ -1014,9 +1014,9 @@ int pdbusy; /* number of times daemon found a busy page */
int pdpageouts; /* number of times daemon started a pageout */
int pdpending; /* number of times daemon got a pending pagout */
int pddeact; /* number of pages daemon deactivates */
int pdreanon; /* anon pages reactivated due to min threshold */
int pdrevnode; /* vnode pages reactivated due to min threshold */
int pdrevtext; /* vtext pages reactivated due to min threshold */
int unused11; /* formerly pdreanon */
int unused12; /* formerly pdrevnode */
int unused13; /* formerly pdrevtext */
int fpswtch; /* FPU context switches */
int kmapent; /* number of kernel map entries */

9
sys/uvm/uvm_stat.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: uvm_stat.c,v 1.29 2016/05/08 11:52:32 stefan Exp $ */
/* $OpenBSD: uvm_stat.c,v 1.30 2018/06/19 22:35:07 krw Exp $ */
/* $NetBSD: uvm_stat.c,v 1.18 2001/03/09 01:02:13 chs Exp $ */
/*
@ -57,8 +57,6 @@ uvmexp_print(int (*pr)(const char *, ...))
(*pr)(" min %d%% (%d) anon, %d%% (%d) vnode, %d%% (%d) vtext\n",
uvmexp.anonminpct, uvmexp.anonmin, uvmexp.vnodeminpct,
uvmexp.vnodemin, uvmexp.vtextminpct, uvmexp.vtextmin);
(*pr)(" pages %d anon, %d vnode, %d vtext\n",
uvmexp.anonpages, uvmexp.vnodepages, uvmexp.vtextpages);
(*pr)(" freemin=%d, free-target=%d, inactive-target=%d, "
"wired-max=%d\n", uvmexp.freemin, uvmexp.freetarg, uvmexp.inactarg,
uvmexp.wiredmax);
@ -89,9 +87,8 @@ uvmexp_print(int (*pr)(const char *, ...))
uvmexp.pdbusy, uvmexp.pdfreed, uvmexp.pdreact, uvmexp.pddeact);
(*pr)(" pageouts=%d, pending=%d, nswget=%d\n", uvmexp.pdpageouts,
uvmexp.pdpending, uvmexp.nswget);
(*pr)(" nswapdev=%d, nanon=%d, nanonneeded=%d nfreeanon=%d\n",
uvmexp.nswapdev, uvmexp.nanon, uvmexp.nanonneeded,
uvmexp.nfreeanon);
(*pr)(" nswapdev=%d\n",
uvmexp.nswapdev);
(*pr)(" swpages=%d, swpginuse=%d, swpgonly=%d paging=%d\n",
uvmexp.swpages, uvmexp.swpginuse, uvmexp.swpgonly, uvmexp.paging);

27
sys/uvm/uvmexp.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: uvmexp.h,v 1.2 2016/05/08 11:52:32 stefan Exp $ */
/* $OpenBSD: uvmexp.h,v 1.3 2018/06/19 22:35:07 krw Exp $ */
#ifndef _UVM_UVMEXP_
#define _UVM_UVMEXP_
@ -55,9 +55,9 @@ struct uvmexp {
int zeropages; /* number of zero'd pages */
int reserve_pagedaemon; /* number of pages reserved for pagedaemon */
int reserve_kernel; /* number of pages reserved for kernel */
int anonpages; /* number of pages used by anon pagers */
int vnodepages; /* number of pages used by vnode page cache */
int vtextpages; /* number of pages used by vtext vnodes */
int unused01; /* formerly anonpages */
int vnodepages; /* XXX # of pages used by vnode page cache */
int vtextpages; /* XXX # of pages used by vtext vnodes */
/* pageout params */
int freemin; /* min number of free pages */
@ -77,9 +77,9 @@ struct uvmexp {
int swpginuse; /* number of swap pages in use */
int swpgonly; /* number of swap pages in use, not also in RAM */
int nswget; /* number of times fault calls uvm_swap_get() */
int nanon; /* number total of anon's in system */
int nanonneeded;/* number of anons currently needed */
int nfreeanon; /* number of free anon's */
int nanon; /* XXX number total of anon's in system */
int unused05; /* formerly nanonneeded */
int unused06; /* formerly nfreeanon */
/* stat counters */
int faults; /* page fault count */
@ -90,8 +90,8 @@ struct uvmexp {
int syscalls; /* system calls */
int pageins; /* pagein operation count */
/* pageouts are in pdpageouts below */
int obsolete_swapins; /* swapins */
int obsolete_swapouts; /* swapouts */
int unused07; /* formerly obsolete_swapins */
int unused08; /* formerly obsolete_swapouts */
int pgswapin; /* pages swapped in */
int pgswapout; /* pages swapped out */
int forks; /* forks */
@ -101,8 +101,7 @@ struct uvmexp {
was available */
int pga_zeromiss; /* pagealloc where zero wanted and zero
not available */
int zeroaborts; /* number of times page zeroing was
aborted */
int unused09; /* formerly zeroaborts */
/* fault subcounters */
int fltnoram; /* number of times fault was out of ram */
@ -138,9 +137,9 @@ struct uvmexp {
int pdpageouts; /* number of times daemon started a pageout */
int pdpending; /* number of times daemon got a pending pagout */
int pddeact; /* number of pages daemon deactivates */
int pdreanon; /* anon pages reactivated due to min threshold */
int pdrevnode; /* vnode pages reactivated due to min threshold */
int pdrevtext; /* vtext pages reactivated due to min threshold */
int unused11; /* formerly pdreanon */
int unused12; /* formerly pdrevnode */
int unused13; /* formerly pdrevtext */
int fpswtch; /* FPU context switches */
int kmapent; /* number of kernel map entries */

22
usr.bin/systat/systat.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: systat.1,v 1.106 2018/05/30 13:53:09 jmc Exp $
.\" $OpenBSD: systat.1,v 1.107 2018/06/19 22:35:07 krw Exp $
.\" $NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@ -30,7 +30,7 @@
.\"
.\" @(#)systat.1 8.2 (Berkeley) 12/30/93
.\"
.Dd $Mdocdate: May 30 2018 $
.Dd $Mdocdate: June 19 2018 $
.Dt SYSTAT 1
.Os
.Sh NAME
@ -590,8 +590,6 @@ zero'd pages
pages reserved for pagedaemon
.It reserve_kernel
pages reserved for kernel.
.It anonpages
pages used by anon pagers
.It vnodepages
pages used by vnode page cache
.It vtextpages
@ -612,10 +610,6 @@ software interrupt count
system calls
.It pageins
pagein operation count
.It obsolete_swapins
swapins
.It obsolete_swapouts
swapouts
.It pgswapin
pages swapped in
.It pgswapout
@ -630,8 +624,6 @@ forks where vmspace is shared
pagealloc found requested zero'd pages
.It pga_zeromiss
pagealloc failed to obtain zero'd pages
.It zeroaborts
page zeroing was aborted
.Pp
.It Fault Counters:
.It fltnoram
@ -708,10 +700,6 @@ in use swap pages not in RAM
fault called uvm_swap_get()
.It nanon
total anon's
.It nanonneeded
anons currently needed
.It nfreeanon
free anon's
.Pp
.It Daemon Counters:
.It pdwoke
@ -738,12 +726,6 @@ times daemon started a pageout
times daemon got a pending pagout
.It pddeact
pages daemon deactivates
.It pdreanon
reactivated anon pages
.It pdrevnode
reactivated vnode pages
.It pdrevtext
reactivated vtext pages
.Pp
.It Misc Counters:
.It fpswtch

28
usr.bin/systat/uvm.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: uvm.c,v 1.2 2018/06/01 19:21:33 bluhm Exp $ */
/* $OpenBSD: uvm.c,v 1.3 2018/06/19 22:35:07 krw Exp $ */
/*
* Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org>
* Copyright (c) 2018 Kenneth R Westerback <krw@openbsd.org>
@ -82,20 +82,18 @@ struct uvmline uvmline[] = {
&uvmexp.fltrelckok, &last_uvmexp.fltrelckok, "fltrelckok" },
{ &uvmexp.reserve_pagedaemon, &last_uvmexp.reserve_pagedaemon,
"reserve_pagedaemon",
&uvmexp.obsolete_swapins, &last_uvmexp.obsolete_swapins,
"obsolete_swapins",
NULL, NULL, NULL,
&uvmexp.fltanget, &last_uvmexp.fltanget, "fltanget" },
{ &uvmexp.reserve_kernel, &last_uvmexp.reserve_kernel, "reserve_kernel",
&uvmexp.obsolete_swapouts, &last_uvmexp.obsolete_swapouts,
"obsolete_swapouts",
NULL, NULL, NULL,
&uvmexp.fltanretry, &last_uvmexp.fltanretry, "fltanretry" },
{ &uvmexp.anonpages, &last_uvmexp.anonpages, "anonpages",
{ NULL, NULL, NULL,
&uvmexp.pgswapin, &last_uvmexp.pgswapin, "pgswapin",
&uvmexp.fltamcopy, &last_uvmexp.fltamcopy, "fltamcopy" },
{ &uvmexp.vnodepages, &last_uvmexp.vnodepages, "vnodepages",
{ NULL, NULL, NULL,
&uvmexp.pgswapout, &last_uvmexp.pgswapout, "pgswapout",
&uvmexp.fltnamap, &last_uvmexp.fltnamap, "fltnamap" },
{ &uvmexp.vtextpages, &last_uvmexp.vtextpages, "vtextpages",
{ NULL, NULL, NULL,
&uvmexp.forks, &last_uvmexp.forks, "forks",
&uvmexp.fltnomap, &last_uvmexp.fltnomap, "fltnomap" },
{ NULL, NULL, NULL,
@ -111,7 +109,7 @@ struct uvmline uvmline[] = {
&uvmexp.pga_zeromiss, &last_uvmexp.pga_zeromiss, "pga_zeromiss",
&uvmexp.flt_acow, &last_uvmexp.flt_acow, "flt_acow" },
{ &uvmexp.inactarg, &last_uvmexp.inactarg, "inactarg",
&uvmexp.zeroaborts, &last_uvmexp.zeroaborts, "zeroaborts",
NULL, NULL, NULL,
&uvmexp.flt_obj, &last_uvmexp.flt_obj, "flt_obj" },
{ &uvmexp.wiredmax, &last_uvmexp.wiredmax, "wiredmax",
NULL, NULL, NULL,
@ -135,13 +133,13 @@ struct uvmline uvmline[] = {
&uvmexp.nswget, &last_uvmexp.nswget, "nswget",
&uvmexp.pdswout, &last_uvmexp.pdswout, "pdswout" },
{ NULL, NULL, NULL,
&uvmexp.nanon, &last_uvmexp.nanon, "nanon",
NULL, NULL, NULL,
&uvmexp.pdfreed, &last_uvmexp.pdfreed, "pdfreed" },
{ NULL, NULL, "Misc Counters",
&uvmexp.nanonneeded, &last_uvmexp.nanonneeded, "nanonneeded",
NULL, NULL, NULL,
&uvmexp.pdscans, &last_uvmexp.pdscans, "pdscans" },
{ &uvmexp.fpswtch, &last_uvmexp.fpswtch, "fpswtch",
&uvmexp.nfreeanon, &last_uvmexp.nfreeanon, "nfreeanon",
NULL, NULL, NULL,
&uvmexp.pdanscan, &last_uvmexp.pdanscan, "pdanscan" },
{ &uvmexp.kmapent, &last_uvmexp.kmapent, "kmapent",
NULL, NULL, NULL,
@ -163,13 +161,13 @@ struct uvmline uvmline[] = {
&uvmexp.pddeact, &last_uvmexp.pddeact, "pddeact" },
{ NULL, NULL, NULL,
NULL, NULL, NULL,
&uvmexp.pdreanon, &last_uvmexp.pdreanon, "pdrenon" },
NULL, NULL, NULL },
{ NULL, NULL, NULL,
NULL, NULL, NULL,
&uvmexp.pdrevnode, &last_uvmexp.pdrevnode, "pdrevnode" },
NULL, NULL, NULL },
{ NULL, NULL, NULL,
NULL, NULL, NULL,
&uvmexp.pdrevtext, &last_uvmexp.pdrevtext, "pdrevtext" }
NULL, NULL, NULL }
};
field_def fields_uvm[] = {

4
usr.bin/vmstat/vmstat.c
View File

@ -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.144 2018/04/26 15:55:14 guenther Exp $ */
/* $OpenBSD: vmstat.c,v 1.145 2018/06/19 22:35:07 krw Exp $ */
/*
* Copyright (c) 1980, 1986, 1991, 1993
@ -517,8 +517,6 @@ dosum(void)
/* swap */
(void)printf("%11u swap pages\n", uvmexp.swpages);
(void)printf("%11u swap pages in use\n", uvmexp.swpginuse);
(void)printf("%11u total anons in system\n", uvmexp.nanon);
(void)printf("%11u free anons\n", uvmexp.nfreeanon);
/* stat counters */
(void)printf("%11u page faults\n", uvmexp.faults);