For the vmstat sub-display:

vmstat.c:
Move totfr to be under daefr and prcfr since it logically belongs there.

Move all the count fields (wire, act, inact, cache and free) to near
the bottom of the sub-display (after all the rate fields) to reduce
competition with adjoining sub-displays.

systat.1:
Move things as above.

Attempt to improve missing and poor wording in the description of the
fields.  The long sentence was hard to parse and didn't say anything
about the different units.

Increment .Dd.

2 files changed, 45 insertions, 36 deletions

diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index befa54b..44a8578 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -32,7 +32,7 @@
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\" $FreeBSD$
 .\"
-.Dd September 9, 1997
+.Dd May 1, 2006
 .Dt SYSTAT 1
 .Os
 .Sh NAME
@@ -370,25 +370,34 @@ the second row of the display shows the average
 number of pages transferred per second over the last refresh interval.
 .Pp
 Below the paging statistics is a column of lines regarding the virtual
-memory system which list the average number of
+memory system.
+The first few lines describe,
+in units (except as noted below)
+of pages per second averaged over the sampling interval,
 pages copied on write (`cow'),
 pages zero filled on demand (`zfod'),
-pages optimize zero filled on demand (`ozfod'),
-the ratio ozfod / zfod as a percentage (`%ozfod'),
+pages optimally zero filled on demand (`ozfod'),
+the ratio of the (average) ozfod / zfod as a percentage (`%ozfod'),
+pages freed by the page daemon (`daefr'),
+pages freed by exiting processes (`prcfr'),
 total pages freed (`totfr'),
+pages reactivated from the free list (`react'),
+the average number of
+times per second that the page daemon was awakened (`pdwak'),
+pages analyzed by the page daemon (`pdpgs'),
+and
+in-transit blocking page faults (`intrn').
+Note that the units are special for `%ozfod' and `pdwak'.
+The next few lines describe,
+as amounts of memory in in kilobytes,
 pages wired down (`wire'),
 active pages (`act'),
 inactive pages (`inact'),
 pages on the cache queue (`cache'),
-number of free pages (`free'),
-pages freed by the page daemon (`daefr'),
-pages freed by exiting processes (`prcfr'),
-pages reactivated from the free list (`react'),
-times the page daemon was awakened (`pdwak'),
-pages analyzed by the page daemon (`pdpgs'),
 and
-intransit blocking page faults (`intrn')
-per second over the refresh interval.
+free pages (`free').
+Note that the values displayed are the current transient ones;
+they are not averages.
 .Pp
 At the bottom of this column is a line showing the
 amount of virtual memory, in kilobytes, mapped into the buffer cache (`buf').
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index f2e2cf1..5aa28c1 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -338,18 +338,18 @@ labelkre()
 	mvprintw(VMSTATROW + 1, VMSTATCOL + 9, "zfod");
 	mvprintw(VMSTATROW + 2, VMSTATCOL + 9, "ozfod");
 	mvprintw(VMSTATROW + 3, VMSTATCOL + 9 - 1, "%%ozfod");
-	mvprintw(VMSTATROW + 4, VMSTATCOL + 9, "totfr");
-	mvprintw(VMSTATROW + 5, VMSTATCOL + 9, "wire");
-	mvprintw(VMSTATROW + 6, VMSTATCOL + 9, "act");
-	mvprintw(VMSTATROW + 7, VMSTATCOL + 9, "inact");
-	mvprintw(VMSTATROW + 8, VMSTATCOL + 9, "cache");
-	mvprintw(VMSTATROW + 9, VMSTATCOL + 9, "free");
-	mvprintw(VMSTATROW + 10, VMSTATCOL + 9, "daefr");
-	mvprintw(VMSTATROW + 11, VMSTATCOL + 9, "prcfr");
-	mvprintw(VMSTATROW + 12, VMSTATCOL + 9, "react");
-	mvprintw(VMSTATROW + 13, VMSTATCOL + 9, "pdwak");
-	mvprintw(VMSTATROW + 14, VMSTATCOL + 9, "pdpgs");
-	mvprintw(VMSTATROW + 15, VMSTATCOL + 9, "intrn");
+	mvprintw(VMSTATROW + 4, VMSTATCOL + 9, "daefr");
+	mvprintw(VMSTATROW + 5, VMSTATCOL + 9, "prcfr");
+	mvprintw(VMSTATROW + 6, VMSTATCOL + 9, "totfr");
+	mvprintw(VMSTATROW + 7, VMSTATCOL + 9, "react");
+	mvprintw(VMSTATROW + 8, VMSTATCOL + 9, "pdwak");
+	mvprintw(VMSTATROW + 9, VMSTATCOL + 9, "pdpgs");
+	mvprintw(VMSTATROW + 10, VMSTATCOL + 9, "intrn");
+	mvprintw(VMSTATROW + 11, VMSTATCOL + 9, "wire");
+	mvprintw(VMSTATROW + 12, VMSTATCOL + 9, "act");
+	mvprintw(VMSTATROW + 13, VMSTATCOL + 9, "inact");
+	mvprintw(VMSTATROW + 14, VMSTATCOL + 9, "cache");
+	mvprintw(VMSTATROW + 15, VMSTATCOL + 9, "free");
 	if (LINES - 1 > VMSTATROW + 16)
 		mvprintw(VMSTATROW + 16, VMSTATCOL + 9, "buf");
 
@@ -508,18 +508,18 @@ showkre()
 	PUTRATE(v_ozfod, VMSTATROW + 2, VMSTATCOL, 8);
 	putint(s.v_zfod != 0 ? (int)(s.v_ozfod * 100.0 / s.v_zfod) : 0,
 	    VMSTATROW + 3, VMSTATCOL + 1, 8 - 1);
-	PUTRATE(v_tfree, VMSTATROW + 4, VMSTATCOL + 2, 8 - 2);
-	putint(pgtokb(s.v_wire_count), VMSTATROW + 5, VMSTATCOL + 2, 8 - 2);
-	putint(pgtokb(s.v_active_count), VMSTATROW + 6, VMSTATCOL, 8);
-	putint(pgtokb(s.v_inactive_count), VMSTATROW + 7, VMSTATCOL, 8);
-	putint(pgtokb(s.v_cache_count), VMSTATROW + 8, VMSTATCOL, 8);
-	putint(pgtokb(s.v_free_count), VMSTATROW + 9, VMSTATCOL, 8);
-	PUTRATE(v_dfree, VMSTATROW + 10, VMSTATCOL, 8);
-	PUTRATE(v_pfree, VMSTATROW + 11, VMSTATCOL, 8);
-	PUTRATE(v_reactivated, VMSTATROW + 12, VMSTATCOL, 8);
-	PUTRATE(v_pdwakeups, VMSTATROW + 13, VMSTATCOL, 8);
-	PUTRATE(v_pdpages, VMSTATROW + 14, VMSTATCOL, 8);
-	PUTRATE(v_intrans, VMSTATROW + 15, VMSTATCOL, 8);
+	PUTRATE(v_dfree, VMSTATROW + 4, VMSTATCOL + 2, 8 - 2);
+	PUTRATE(v_pfree, VMSTATROW + 5, VMSTATCOL + 2, 8 - 2);
+	PUTRATE(v_tfree, VMSTATROW + 6, VMSTATCOL, 8);
+	PUTRATE(v_reactivated, VMSTATROW + 7, VMSTATCOL, 8);
+	PUTRATE(v_pdwakeups, VMSTATROW + 8, VMSTATCOL, 8);
+	PUTRATE(v_pdpages, VMSTATROW + 9, VMSTATCOL, 8);
+	PUTRATE(v_intrans, VMSTATROW + 10, VMSTATCOL, 8);
+	putint(pgtokb(s.v_wire_count), VMSTATROW + 11, VMSTATCOL, 8);
+	putint(pgtokb(s.v_active_count), VMSTATROW + 12, VMSTATCOL, 8);
+	putint(pgtokb(s.v_inactive_count), VMSTATROW + 13, VMSTATCOL, 8);
+	putint(pgtokb(s.v_cache_count), VMSTATROW + 14, VMSTATCOL, 8);
+	putint(pgtokb(s.v_free_count), VMSTATROW + 15, VMSTATCOL, 8);
 	if (LINES - 1 > VMSTATROW + 16)
 		putint(s.bufspace / 1024, VMSTATROW + 16, VMSTATCOL, 8);
 	PUTRATE(v_vnodein, PAGEROW + 2, PAGECOL + 6, 5);