update struct uvmexp, and fix some spacing issues while here;

ok tedu

1 files changed, 84 insertions, 59 deletions

diff --git a/share/man/man9/uvm.9 b/share/man/man9/uvm.9
index 51788a4715c..803069ecff1 100644
--- a/share/man/man9/uvm.9
+++ b/share/man/man9/uvm.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uvm.9,v 1.41 2009/12/15 07:34:58 jmc Exp $
+.\"	$OpenBSD: uvm.9,v 1.42 2010/11/09 16:03:38 jmc 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: December 15 2009 $
+.Dd $Mdocdate: November 9 2010 $
 .Dt UVM 9
 .Os
 .Sh NAME
@@ -706,9 +706,9 @@ The
 .Fa flags
 can be any of:
 .Bd -literal
-#define UVM_PLA_WAITOK		0x0001	/* may sleep */
-#define UVM_PLA_NOWAIT		0x0002	/* can't sleep */
-#define UVM_PLA_ZERO		0x0004	/* zero all pages before returning */
+#define UVM_PLA_WAITOK	0x0001	/* may sleep */
+#define UVM_PLA_NOWAIT	0x0002	/* can't sleep */
+#define UVM_PLA_ZERO	0x0004	/* zero all pages before returning */
 .Ed
 .Pp
 The
@@ -794,7 +794,7 @@ function swaps in the named process.
 .Ft void
 .Fn uvm_fork "struct proc *p1" "struct proc *p2" "boolean_t shared" \
              "void *stack" "size_t stacksize" "void (*func)(void *arg)" \
-	     "void *arg"
+             "void *arg"
 .Ft int
 .Fn uvm_grow "struct proc *p" "vaddr_t sp"
 .Ft int
@@ -899,75 +899,100 @@ int npages;     /* number of pages we manage */
 int free;       /* number of free pages */
 int active;     /* number of active pages */
 int inactive;   /* number of pages that we free'd but may want back */
-int paging;     /* number of pages in the process of being paged out */
+int paging;	/* number of pages in the process of being paged out */
 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 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 */
 
 /* pageout params */
 int freemin;    /* min number of free pages */
 int freetarg;   /* target number of free pages */
 int inactarg;   /* target number of inactive pages */
 int wiredmax;   /* max number of wired pages */
+int anonmin;	/* min threshold for anon pages */
+int vtextmin;	/* min threshold for vtext pages */
+int vnodemin;	/* min threshold for vnode pages */
+int anonminpct;	/* min percent anon pages */
+int vtextminpct;/* min percent vtext pages */
+int vnodeminpct;/* min percent vnode pages */
 
 /* swap */
-int nswapdev;   /* number of configured swap devices in system */
-int swpages;    /* number of PAGE_SIZE'ed swap pages */
-int swpginuse;  /* number of swap pages in use */
-int nswget;     /* number of times fault calls uvm_swap_get() */
-int nanon;      /* number total of anons in system */
-int nfreeanon;  /* number of free anons */
+int nswapdev;	/* number of configured swap devices in system */
+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 */
 
 /* stat counters */
-int faults;             /* page fault count */
-int traps;              /* trap count */
-int intrs;              /* interrupt count */
-int swtch;              /* context switch count */
-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 pgswapin;           /* pages swapped in */
-int pgswapout;          /* pages swapped out */
-int forks;              /* forks */
-int forks_ppwait;       /* forks where parent waits */
-int forks_sharevm;      /* forks where vmspace is shared */
+int faults;		/* page fault count */
+int traps;		/* trap count */
+int intrs;		/* interrupt count */
+int swtch;		/* context switch count */
+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 pgswapin;		/* pages swapped in */
+int pgswapout;		/* pages swapped out */
+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 */
+int pga_zeromiss;	/* pagealloc where zero wanted and zero
+			   not available */
+int zeroaborts;		/* number of times page zeroing was
+			   aborted */
 
 /* fault subcounters */
-int fltnoram;   /* number of times fault was out of ram */
-int fltnoanon;  /* number of times fault was out of anons */
-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 */
-int fltrelckok; /* number of times fault relock is a success */
-int fltanget;   /* number of times fault gets anon page */
-int fltanretry; /* number of times fault retrys an anon get */
-int fltamcopy;  /* number of times fault clears "needs copy" */
-int fltnamap;   /* number of times fault maps a neighbor anon page */
-int fltnomap;   /* number of times fault maps a neighbor obj page */
-int fltlget;    /* number of times fault does a locked pgo_get */
-int fltget;     /* number of times fault does an unlocked get */
-int flt_anon;   /* number of times fault anon (case 1a) */
-int flt_acow;   /* number of times fault anon cow (case 1b) */
-int flt_obj;    /* number of times fault is on object page (2a) */
-int flt_prcopy; /* number of times fault promotes with copy (2b) */
-int flt_przero; /* number of times fault promotes with zerofill (2b) */
+int fltnoram;	/* number of times fault was out of ram */
+int fltnoanon;	/* number of times fault was out of anons */
+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 */
+int fltrelckok;	/* number of times fault relock is a success */
+int fltanget;	/* number of times fault gets anon page */
+int fltanretry;	/* number of times fault retrys an anon get */
+int fltamcopy;	/* number of times fault clears "needs copy" */
+int fltnamap;	/* number of times fault maps a neighbor anon page */
+int fltnomap;	/* number of times fault maps a neighbor obj page */
+int fltlget;	/* number of times fault does a locked pgo_get */
+int fltget;	/* number of times fault does an unlocked get */
+int flt_anon;	/* number of times fault anon (case 1a) */
+int flt_acow;	/* number of times fault anon cow (case 1b) */
+int flt_obj;	/* number of times fault is on object page (2a) */
+int flt_prcopy;	/* number of times fault promotes with copy (2b) */
+int flt_przero;	/* number of times fault promotes with zerofill (2b) */
 
 /* daemon counters */
-int pdwoke;     /* number of times daemon woke up */
-int pdrevs;     /* number of times daemon rev'd clock hand */
-int pdswout;    /* number of times daemon called for swapout */
-int pdfreed;    /* number of pages daemon freed since boot */
-int pdscans;    /* number of pages daemon scanned since boot */
-int pdanscan;   /* number of anonymous pages scanned by daemon */
-int pdobscan;   /* number of object pages scanned by daemon */
-int pdreact;    /* number of pages daemon reactivated since boot */
-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 pdwoke;	/* number of times daemon woke up */
+int pdrevs;	/* number of times daemon rev'd clock hand */
+int pdswout;	/* number of times daemon called for swapout */
+int pdfreed;	/* number of pages daemon freed since boot */
+int pdscans;	/* number of pages daemon scanned since boot */
+int pdanscan;	/* number of anonymous pages scanned by daemon */
+int pdobscan;	/* number of object pages scanned by daemon */
+int pdreact;	/* number of pages daemon reactivated since boot */
+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 fpswtch;	/* FPU context switches */
+int kmapent;	/* number of kernel map entries */
 .Ed
 .Pp
 The