1) display full time string in 'vmstat' display so you can tell

   the difference between an inactive display and a hung machine.
2) Update the man page for 'vmstat' to reflect reality (and actually
   explain all those vm abbreviations).

netbsd PR bin/2756 (Jonathan Stone <jonathan@DSG.Stanford.EDU>

2 files changed, 63 insertions, 50 deletions

diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index bb7e35572f2..6411ee37e75 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: systat.1,v 1.4 1996/07/08 22:09:43 ccappuc Exp $
+.\"	$OpenBSD: systat.1,v 1.5 1997/07/29 04:47:13 flipk Exp $
 .\"	$NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -240,16 +240,8 @@ needed if all processes had all of their pages.
 Finally the last column shows the number of physical pages
 on the free list.
 .Pp
-Below the memory display is the disk usage display.
-It reports the number of seeks, transfers, number
-of kilobyte blocks transferred per second averaged over the
-refresh period of the display (by default, five seconds), and
-the time spent in disk accesses.
-Note that the system only keeps statistics on at most four disks.
-.Pp
-Below the disk display is a list of the
-average number of processes (over the last refresh interval)
-that are runnable (`r'), in page wait (`p'),
+Below the memory display is a list of the average number of processes
+(over the last refresh interval) that are runnable (`r'), in page wait (`p'),
 in disk wait other than paging (`d'),
 sleeping (`s'), and swapped out but desiring to run (`w').
 Below the queue length listing is a numerical listing and
@@ -257,13 +249,24 @@ a bar graph showing the amount of
 system (shown as `='), user (shown as `>'),
 nice (shown as `-'), and idle time (shown as ` ').
 .Pp
-At the bottom left are statistics on name translations.
+To the right of the Proc display are statistics about 
+Context switches (`Csw'), Traps (`Trp'), Syscalls (`Sys'),
+Interrupts (`Int'), Soft interrupts (`Sof'), and Faults (`Flt')
+which have occured during the last refresh interval.
+.Pp
+Below the CPU Usage graph are statistics on name translations.
 It lists the number of names translated in the previous interval,
 the number and percentage of the translations that were
 handled by the system wide name translation cache, and
 the number and percentage of the translations that were
 handled by the per process name translation cache.
 .Pp
+At the bottom left is the disk usage display.
+It reports the number of seeks, transfers, number
+of kilobyte blocks transferred per second averaged over the
+refresh period of the display (by default, five seconds), and
+the time spent in disk accesses.
+.Pp
 Under the date in the upper right hand quadrant are statistics
 on paging and swapping activity.
 The first two columns report the average number of pages
@@ -277,42 +280,6 @@ number of disk transfers per second over the last refresh interval;
 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 line listing the average number of
-total reclaims ('Rec'),
-intransit blocking page faults (`It'),
-swap text pages found in free list (`F/S'),
-file system text pages found in free list (`F/F'),
-reclaims from free list
-pages freed by the clock daemon (`Fre'),
-and sequential process pages freed (`SFr')
-per second over the refresh interval.
-.Pp
-Below this line are statistics on the average number of
-zero filled pages (`zf') and demand filled text pages (`xf')
-per second over the refresh period.
-The first row indicates the number of requests that were
-resolved, the second row shows the number that were set up,
-and the last row shows the percentage of setup requests that were
-actually used.
-Note that this percentage is usually less than 100%,
-however it may exceed 100% if a large number of requests
-are actually used long after they were set up during a
-period when no new pages are being set up.
-Thus this figure is most interesting when observed over
-a long time period, such as from boot time
-(see below on getting such a display).
-.Pp
-Below the page fill statistics is a column that
-lists the average number of context switches (`Csw'),
-traps (`Trp'; includes page faults), system calls (`Sys'), interrupts (`Int'),
-characters output to DZ ports using
-.No pseudo Ns -DMA
-(`Pdm'),
-network software interrupts (`Sof'),
-page faults (`Flt'), pages scanned by the page daemon (`Scn'),
-and revolutions of the page daemon's hand (`Rev')
-per second over the refresh interval.
-.Pp
 Running down the right hand side of the display is a breakdown
 of the interrupts being handled by the system.
 At the top of the list is the total interrupts per second
@@ -321,6 +288,50 @@ The rest of the column breaks down the total on a device
 by device basis.
 Only devices that have interrupted at least once since boot time are shown.
 .Pp
+Below the SWAPPING display and slightly to the left of the Interrupts
+display is a list of virtual memory statistics. The abbreviations are:
+.Bl -tag -compact -width XXXXXX -offset indent
+.It cow
+copy-on-write faults
+.It objlk
+object cache lookups
+.It objht
+object cache hits
+.It zfod
+pages zero filled on demand
+.It nzfod
+number of zfod's created
+.It %zfod
+percentage of zfod's used
+.It kern
+number of pages in use by kernel
+.It wire
+number of pages wired down
+.It act
+number of pages active
+.It inact
+number of pages inactive
+.It free
+number of pages free
+.It daefr
+pages freed by daemon
+.It prcfr
+pages freed by exiting processes
+.It react
+number of pages reactivated from free list
+.It scan
+scans in page out daemon
+.It hdrev
+revolutions of the hand in page out daemon
+.It intrn
+intransit blocking page faults
+.El
+.Pp
+The `%zfod' value is more interesting when observed over a long
+period, such as from boot time (see the
+.Cm boot
+option below).
+.Pp
 The following commands are specific to the
 .Ic vmstat
 display; the minimum unambiguous prefix may be supplied.
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 9afd20a3945..b53e093826a 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmstat.c,v 1.5 1996/12/20 00:17:29 downsj Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.6 1997/07/29 04:47:13 flipk Exp $	*/
 /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
-static char rcsid[] = "$OpenBSD: vmstat.c,v 1.5 1996/12/20 00:17:29 downsj Exp $";
+static char rcsid[] = "$OpenBSD: vmstat.c,v 1.6 1997/07/29 04:47:13 flipk Exp $";
 #endif /* not lint */
 
 /*
@@ -309,7 +309,9 @@ fetchkre()
 
 	time(&now);
 	strcpy(buf, ctime(&now));
+#if 0
 	buf[16] = '\0';
+#endif
 	getinfo(&s, state);
 }