Abbreviate long field descriptors at write time so that they don't get

clobbered at runtime:
    dirtybuf -> dtbuf
    desiredvnodes -> desvn
    numvnodes -> numvn
    freevnodes -> frevn
The vmstats column has only 5 characters available for descriptors, but up
to 13 were used.  The extras get clobbered at runtime by interrupt values
and/or descriptors on systems with more than 12 interrupt sources.
    %slo-z -> %sloz
This one is in the "extended" vmstats area and doesn't get clobbered now.

Removed stale documentation of desvn.

Changed a descriptor:
    tfree -> totfr
so that it is consistent with the abbreviations for other free counts
(daefr and prcfr) and thus almost decodeable.

Fixed missing documentation of tfree/totfr.  This and everything else
in the extended vmstats area is misdocumented as being in a certain
place in the vmstats column.

2 files changed, 12 insertions, 12 deletions

diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index abc47c2c6868..f0002e0dd462 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -367,7 +367,8 @@ memory system which list the average number of
 pages copied on write (`cow'),
 pages zero filled on demand (`zfod'),
 pages optimize zero filled on demand (`ozfod'),
-slow (on-the-fly) zero fills percentage (`%slo-z'),
+slow (on-the-fly) zero fills percentage (`%sloz'),
+total pages freed (`totfr'),
 pages wired down (`wire'),
 active pages (`act'),
 inactive pages (`inact'),
@@ -384,12 +385,11 @@ per second over the refresh interval.
 .Pp
 At the bottom of this column are lines showing the
 amount of memory, in kilobytes, used for the buffer cache (`buf'),
-the number of dirty buffers in the buffer cache (`dirtybuf'),
-desired maximum size of vnode cache (`desiredvnodes') (mostly unused,
-except to size the name cache),
-number of vnodes actually allocated (`numvnodes'),
+the number of dirty buffers in the buffer cache (`dtbuf'),
+desired maximum size of vnode cache (`desvn'),
+number of vnodes actually allocated (`numvn'),
 and
-number of allocated vnodes that are free (`freevnodes').
+number of allocated vnodes that are free (`frevn').
 .Pp
 Running down the right hand side of the display is a breakdown
 of the interrupts being handled by the system.
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 4e47618f1afd..09cbb7fd2089 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -315,11 +315,11 @@ labelkre()
 	mvprintw(VMSTATROW + 11, VMSTATCOL + 10, "pdpgs");
 	mvprintw(VMSTATROW + 12, VMSTATCOL + 10, "intrn");
 	mvprintw(VMSTATROW + 13, VMSTATCOL + 10, "buf");
-	mvprintw(VMSTATROW + 14, VMSTATCOL + 10, "dirtybuf");
+	mvprintw(VMSTATROW + 14, VMSTATCOL + 10, "dtbuf");
 
-	mvprintw(VMSTATROW + 15, VMSTATCOL + 10, "desiredvnodes");
-	mvprintw(VMSTATROW + 16, VMSTATCOL + 10, "numvnodes");
-	mvprintw(VMSTATROW + 17, VMSTATCOL + 10, "freevnodes");
+	mvprintw(VMSTATROW + 15, VMSTATCOL + 10, "desvn");
+	mvprintw(VMSTATROW + 16, VMSTATCOL + 10, "numvn");
+	mvprintw(VMSTATROW + 17, VMSTATCOL + 10, "frevn");
 
 	mvprintw(GENSTATROW, GENSTATCOL, " Csw  Trp  Sys  Int  Sof  Flt");
 
@@ -361,8 +361,8 @@ labelkre()
 		 */
 		mvprintw(VMSTATROW + 11, VMSTATCOL - 6, "zfod");
 		mvprintw(VMSTATROW + 12, VMSTATCOL - 6, "ozfod");
-		mvprintw(VMSTATROW + 13, VMSTATCOL - 6, "%%slo-z");
-		mvprintw(VMSTATROW + 14, VMSTATCOL - 6, "tfree");
+		mvprintw(VMSTATROW + 13, VMSTATCOL - 6, "%%sloz");
+		mvprintw(VMSTATROW + 14, VMSTATCOL - 6, "totfr");
 		extended_vm_stats = 1;
 	} else {
 		extended_vm_stats = 0;