 @@ -1,14 +1,14 @@
-/*	$NetBSD: cmdtab.c,v 1.25 2016/08/02 15:56:09 scole Exp $	*/
+/*	$NetBSD: cmdtab.c,v 1.26 2018/12/26 01:47:37 sevan Exp $	*/
 /*-
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,44 +24,45 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: cmdtab.c,v 1.25 2016/08/02 15:56:09 scole Exp $");
+__RCSID("$NetBSD: cmdtab.c,v 1.26 2018/12/26 01:47:37 sevan Exp $");
 #endif /* not lint */
 #include "systat.h"
 #include "extern.h"
 /*
  * NOTE: if one command is a substring of another, the shorter string
  * MUST come first, or it will be shadowed by the longer
  */
 struct	command global_commands[] = {
 	{ "help",	global_help,		"show help"},
 	{ "interval",	global_interval,	"set update interval"},
 	{ "load",	global_load,		"show system load averages"},
 	{ "quit",	global_quit,		"exit systat"},
 	{ "start",	global_interval,	"restart updating display"},
 	{ "stop",	global_stop,		"stop updating display"},
 	{ "?",		global_help,		"show help"},
 	{ .c_name = NULL }
 };
 struct command	df_commands[] = {
 	{ "all",	df_all,         "show all filesystems"},
 	{ "some",	df_some,        "show only some filesystems"},
 	{ .c_name = NULL }
 };
 struct command	icmp_commands[] = {
 	{ "boot",	icmp_boot,	"show total stats since boot"},
 	{ "run",	icmp_run,	"show running total stats"},
 	{ "time",	icmp_time,	"show stats for each sample time"},
 @@ -104,27 +105,27 @@ struct command	ip6_commands[] = {
 	{ "time",	ip6_time,	"show stats for each sample time"},
 	{ "zero",	ip6_zero,	"re-zero running totals"},
 	{ .c_name = NULL }
 };
 #endif
 struct command netstat_commands[] = {
 	{ "all",	netstat_all,	 "include server sockets"},
 	{ "display",	netstat_display, "show specified hosts or ports"},
 	{ "ignore",	netstat_ignore,	 "hide specified hosts or ports"},
 	{ "names",	netstat_names,	 "show names instead of addresses"},
 	{ "numbers",	netstat_numbers, "show addresses instead of names"},
 	{ "reset",	netstat_reset,	 "return to default display"},
-	{ "show",	netstat_show,	"show current display/ignore settings"},
+	{ "show",	netstat_show,	 "show current display/ignore settings"},
 	{ "tcp",	netstat_tcp,	 "show only tcp connections"},
 	{ "udp",	netstat_udp,	 "show only udp connections"},
 	{ .c_name = NULL }
 };
 struct command ps_commands[] = {
 	{ "user",	ps_user,	"limit displayed processes to a user"},
 	{ .c_name = NULL }
 };
 struct command	tcp_commands[] = {
 	{ "boot",	tcp_boot,	"show total stats since boot"},
 	{ "run",	tcp_run,	"show running total stats"},

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.53 2017/11/22 02:52:42 snj Exp $	*/
+/*	$NetBSD: main.c,v 1.54 2018/12/26 01:47:37 sevan Exp $	*/
 /*-
  * Copyright (c) 1980, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,27 +26,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1992, 1993\
  The Regents of the University of California.  All rights reserved.");
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: main.c,v 1.53 2017/11/22 02:52:42 snj Exp $");
+__RCSID("$NetBSD: main.c,v 1.54 2018/12/26 01:47:37 sevan Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 @@ -56,27 +56,27 @@ __RCSID("$NetBSD: main.c,v 1.53 2017/11/
 #include <termios.h>
 #include "systat.h"
 #include "extern.h"
 static int     dellave;
 kvm_t *kd;
 char	*memf = NULL;
 char	*nlistf = NULL;
 sig_t	sigtstpdfl;
 double avenrun[3];
 int     col;
-double	naptime = 5;
+double	naptime = 1;
 int     verbose = 1;                    /* to report kvm read errs */
 int     hz, stathz, maxslp;
 char    c;
 char    *namp;
 char    hostname[MAXHOSTNAMELEN + 1];
 WINDOW  *wnd;
 int     CMDLINE;
 int     turns = 2;	/* stay how many refresh-turns in 'all' mode? */
 int     allflag;
 int     allcounter;
 sig_atomic_t needsredraw = 0;
 static	WINDOW *wload;			/* one line window for load average */
 @@ -163,60 +163,63 @@ main(int argc, char **argv)
 	/*
 	 * Discard setgid privileges.  If not the running kernel, we toss
 	 * them away totally so that bad guys can't print interesting stuff
 	 * from kernel memory, otherwise switch back to kmem for the
 	 * duration of the kvm_openfiles() call.
 	 */
 	if (nlistf != NULL || memf != NULL)
 		(void)setgid(getgid());
 	else
 		(void)setegid(egid);
 	kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf);
-	if (kd == NULL) {
+	if (kd == NULL)
-		error("%s", errbuf);
+		errx(1, "%s", errbuf);
 		exit(1);
 	/* Get rid of privs for now. */
 	if (nlistf == NULL && memf == NULL)
 		(void)setegid(getgid());
 	signal(SIGINT, die);
 	signal(SIGQUIT, die);
 	signal(SIGTERM, die);
 	sv_stop_handler = signal(SIGTSTP, stop);
 	/*
 	 * Initialize display.  Load average appears in a one line
 	 * window of its own.  Current command's display appears in
 	 * an overlapping sub-window of stdscr configured by the display
 	 * routines to minimize update work by curses.
 	 */
 	if (initscr() == NULL)
 		errx(1, "couldn't initialize screen");
 		warnx("couldn't initialize screen");
 		exit(0);
 	CMDLINE = LINES - 1;
 	wnd = (*curmode->c_open)();
 	if (wnd == NULL) {
 		move(CMDLINE, 0);
 		clrtoeol();
 		refresh();
 		endwin();
 		warnx("couldn't initialize display");
 		die(0);
+	}
 	wload = newwin(1, 0, 3, 20);
 	if (wload == NULL) {
 		move(CMDLINE, 0);
 		clrtoeol();
 		refresh();
 		endwin();
 		warnx("couldn't set up load average window");
 		die(0);
+	}
 	gethostname(hostname, sizeof (hostname));
 	hostname[sizeof(hostname) - 1] = '\0';
 	len = sizeof(clk);
 	if (sysctlbyname("kern.clockrate", &clk, &len, NULL, 0))
 		error("can't get \"kern.clockrate\": %s", strerror(errno));
 	hz = clk.hz;
 	stathz = clk.stathz;
 	len = sizeof(maxslp);
 @@ -401,17 +404,16 @@ nlisterr(struct nlist name_list[])
+{
 	int i, n;
 	n = 0;
 	clear();
 	mvprintw(2, 10, "systat: nlist: can't find following symbols:");
 	for (i = 0;
 	    name_list[i].n_name != NULL && *name_list[i].n_name != '\0'; i++)
 		if (name_list[i].n_value == 0)
 			mvprintw(2 + ++n, 10, "%s", name_list[i].n_name);
 	move(CMDLINE, 0);
 	clrtoeol();
 	refresh();
 	sleep(5);
 	endwin();
 	exit(1);
+}

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: systat.1,v 1.48 2017/07/03 21:34:21 wiz Exp $
+.\"	$NetBSD: systat.1,v 1.49 2018/12/26 01:47:37 sevan Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -19,27 +19,27 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\"
-.Dd November 16, 2016
+.Dd December 26, 2018
 .Dt SYSTAT 1
 .Os
 .Sh NAME
 .Nm systat
 .Nd display system statistics in a full-screen view
 .Sh SYNOPSIS
 .Nm
 .Op Fl bn
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Op Fl t Ar turns
 .Op Fl w Ar wait
 .Op Ar display
 @@ -444,40 +444,55 @@ Show the number of times the system call
 Show the average amount of time (in arbitrary units) spent in a call of
 the syscall.
 .El
 .It Ic vmstat
 Take over the entire display and show a (rather crowded) compendium
 of statistics related to virtual memory usage, process scheduling,
 device interrupts, system name translation caching, disk
 .Tn I/O
 etc.
 .Pp
 The upper left quadrant of the screen shows the number
 of users logged in and the load average over the last one, five,
 and fifteen minute intervals.
-Below this is a list of the
+Below this are statistics on memory utilization.
 The first row of the table reports memory usage only among
 active processes, that is processes that have run in the previous
 twenty seconds.
 The second row reports on memory usage of all processes.
 The first column reports on the number of physical pages
 claimed by processes.
 The second column reports the number of physical pages that
 are devoted to read only text pages.
 The third and fourth columns report the same two figures for
 virtual pages, that is the number of pages that would be
 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 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').
 Below the queue length listing is a numerical listing and
 a bar graph showing the amount of
 system (shown as `='), user (shown as `>'),
 nice (shown as `-'), and idle time (shown as ` ').
 .Pp
 To the right of the process statistics is a column that
 lists the average number of context switches (`Csw'),
-traps (`Trp'; includes page faults), system calls (`Sys'), interrupts (`Int'),
+traps (`Traps'; includes page faults), system calls (`SysCa'), interrupts (`Intr'),
-network software interrupts (`Sof'),
+network software interrupts (`Soft'),
-page faults (`Flt').
+page faults (`Fault').
 .Pp
 Below this are statistics on memory utilization.
 The first row of the table reports memory usage only among
 active processes, that is processes that have run in the previous
 twenty seconds.
 The second row reports on memory usage of all processes.
 The first column reports on the number of physical pages
 claimed by processes.
 The second column reports the number of pages of memory and swap.
 The third column gives the number of pages of free memory and swap.
 .Pp
 Below the memory display are statistics on name translations.
 It lists the number of names translated in the previous interval,
 @@ -499,36 +514,95 @@ Under the date in the upper right hand q
 on paging and swapping activity.
 The first two columns report the average number of pages
 brought in and out per second over the last refresh interval
 due to page faults and the paging daemon.
 The third and fourth columns report the average number of pages
 brought in and out per second over the last refresh interval
 due to swap requests initiated by the scheduler.
 The first row of the display shows the average
 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 another columns of paging data.
-From top to bottom, these represent average numbers of copy on write faults
+From top to bottom, these represent:
-(`cow'), object cache lookups (`objlk'), object cache hits (`objht'),
+.Pp
-pages zero filled on demand (`zfodw'), number zfod's created (`nzfod'),
+.Bl -tag -width Fl -compact
-percentage of zfod's used (`%zfod'), number of kernel pages (`kern'),
+.It Ic Sq forks
-number of wired pages (`wire'), number of active pages (`act'), number
+number of fork() calls
-of inactive pages (`inact'), number of free pages (`free'), pages freed
+.It Ic Sq fkppw
-by daemon (`daefr'), pages freed by exiting processes (`prcfr'), number
+number of fork() calls where parent waits
-of pages reactivated from freelist (`react'), scans in page out daemon
+.It Ic Sq fksvm
-(`scan'), revolutions of the hand (`hdrev'), and in-transit blocking page
+number of fork() calls where vmspace is shared
-faults (`intrn'), per second over the refresh period.
+.It Ic Sq pwait
 number of times fault had to wait on a page
 .It Ic Sq relck
 number of times uvmfault_relock() is called
 .It Ic Sq rlkok
 number of times uvmfault_relock() is a success
 .It Ic Sq noram
 number of times fault was out of RAM
 .It Ic Sq ndcpy
 number of times fault clears ``needs copy''
 .It Ic Sq fltcp
 number of times fault promotes with copy (2b)
 .It Ic Sq zfod
 number of times fault promotes with zerofill (2b)
 .It Ic Sq cow
 number of times faulted for anonymous for Copy-On-Write (case 1b)
 .It Ic Sq fmin
 min number of free pages
 .It Ic Sq ftarg
 target number of free pages
 .It Ic Sq itarg
 target number of inactive pages
 .\".It Ic Sq objlk
 .\"object cache lookups
 .\".It Ic Sq objht
 .\"object cache hits
 .\".It Ic Sq zfodw
 .\"pages zero filled on demand
 .\".It Ic Sq nzfod
 .\"number of zfod's created
 .\".It Ic Sq %zfod
 .\"percentage of zfod's used
 .\".It Ic Sq kern
 .\"number of kernel pages
 .It Ic Sq flnan
 number of times fault was out of anonymous pages
 .\".It Ic Sq act
 .\"number of active pages
 .\".It Ic Sq inact
 .\"number of inactive pages
 .\".It Ic Sq free
 .\"number of free pages
 .\".It Ic Sq daefr
 .\"pages freed by daemon
 .\".It Ic Sq prcfr
 .\"pages freed by exiting processes
 .\".It Ic Sq react
 .\"number of pages reactivated from freelist
 .\".It Ic Sq scan
 .\"scans in page out daemon
 .\".It Ic Sq hdrev
 .\"revolutions of the hand
 .\".It Ic Sq intrn
 .\"in-transit blocking page faults per second over the refresh period.
 .It Ic Sq pdfre
 number of pages daemon freed since boot
 .It Ic Sq pdscn
 number of pages daemon scaned since boot
 .El
 .Pp
 Note that the `%zfod' 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
 To the left of the column of paging statistics is a breakdown
 of the interrupts being handled by the system.
 At the top of the list is the total interrupts per second
 over the time interval.
 The rest of the column breaks down the total on a device

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vmstat.c,v 1.82 2017/07/15 08:22:23 mlelstv Exp $	*/
+/*	$NetBSD: vmstat.c,v 1.83 2018/12/26 01:47:37 sevan Exp $	*/
 /*-
  * Copyright (c) 1983, 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
-__RCSID("$NetBSD: vmstat.c,v 1.82 2017/07/15 08:22:23 mlelstv Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.83 2018/12/26 01:47:37 sevan Exp $");
 #endif /* not lint */
 /*
  * Cursed vmstat -- from Robert Elz.
  */
 #include <sys/param.h>
 #include <sys/uio.h>
 #include <sys/namei.h>
 #include <sys/sysctl.h>
 #include <sys/evcnt.h>
 #include <uvm/uvm_extern.h>
 @@ -77,26 +77,27 @@ static float cputime(int);
 static void dinfo(int, int, int);
 static void getinfo(struct Info *);
 static int ucount(void);
 static	char buf[26];
 static	u_int64_t temp;
 double etime;
 static	float hertz;
 static	int nintr;
 static	long *intrloc;
 static	char **intrname;
 static	int nextintsrow;
 static	int disk_horiz = 1;
 static	u_int nbuf;
 WINDOW *
 openvmstat(void)
+{
 	return (stdscr);
+}
 void
 closevmstat(WINDOW *w)
+{
 	if (w == NULL)
 		return;
 @@ -114,46 +115,46 @@ static struct nlist namelist[] = {
 	{ .n_name = "_intrcnt" },
 #define	X_EINTRCNT	3
 	{ .n_name = "_eintrcnt" },
 #define	X_ALLEVENTS	4
 	{ .n_name = "_allevents" },
 	{ .n_name = NULL }
 };
 /*
  * These constants define where the major pieces are laid out
  */
 #define STATROW		 0	/* uses 1 row and 68 cols */
 #define STATCOL		 2
-#define MEMROW		 9	/* uses 4 rows and 31 cols */
+#define MEMROW		 9	/* uses 5 rows and 31 cols */
 #define MEMCOL		 0
 #define PAGEROW		 2	/* uses 4 rows and 26 cols */
 #define PAGECOL		54
 #define INTSROW		 9	/* uses all rows to bottom and 17 cols */
 #define INTSCOL		40
 #define INTSCOLEND	(VMSTATCOL - 0)
 #define PROCSROW	 2	/* uses 2 rows and 20 cols */
 #define PROCSCOL	 0
 #define GENSTATROW	 2	/* uses 2 rows and 30 cols */
 #define GENSTATCOL	17
 #define VMSTATROW	 7	/* uses 17 rows and 15 cols */
 #define VMSTATCOL	64
 #define GRAPHROW	 5	/* uses 3 rows and 51 cols */
 #define GRAPHCOL	 0
-#define NAMEIROW	14	/* uses 3 rows and 38 cols */
+#define NAMEIROW	15	/* uses 3 rows and 38 cols (must be MEMROW + 5 + 1) */
 #define NAMEICOL	 0
-#define DISKROW		18	/* uses 5 rows and 50 cols (for 9 drives) */
+#define DISKROW		19	/* uses 5 rows and 50 cols (for 9 drives) */
 #define DISKCOL		 0
-#define DISKCOLWIDTH	 6
+#define DISKCOLWIDTH	 8
 #define DISKCOLEND	INTSCOL
 typedef struct intr_evcnt intr_evcnt_t;
 struct intr_evcnt {
 	char		*ie_group;
 	char		*ie_name;
 	u_int64_t	*ie_count;	/* kernel address... */
 	int		ie_loc;		/* screen row */
 } *ie_head;
 int nevcnt;
 static void
 get_interrupt_events(void)
 @@ -308,71 +309,73 @@ print_ie_title(int i)
+	}
 	if (name_width != 0)
 		printw("%-.*s", name_width, ie_head[i].ie_name);
+}
 void
 labelvmstat_top(void)
+{
 	clear();
 	mvprintw(STATROW, STATCOL + 4, "users    Load");
-	mvprintw(GENSTATROW, GENSTATCOL, "   Csw    Trp    Sys   Int    Sof    Flt");
+	mvprintw(GENSTATROW, GENSTATCOL, "   Csw  Traps SysCal  Intr   Soft  Fault");
 	mvprintw(GRAPHROW, GRAPHCOL,
 		"    . %% Sy    . %% Us    . %% Ni    . %% In    . %% Id");
 	mvprintw(PROCSROW, PROCSCOL, "Proc:r  d  s");
 	mvprintw(GRAPHROW + 1, GRAPHCOL,
 		"|    |    |    |    |    |    |    |    |    |    |");
 	mvprintw(PAGEROW, PAGECOL + 8, "PAGING   SWAPPING ");
 	mvprintw(PAGEROW + 1, PAGECOL, "        in  out   in  out ");
-	mvprintw(PAGEROW + 2, PAGECOL + 2, "ops");
+	mvprintw(PAGEROW + 2, PAGECOL, "  ops                     ");
-	mvprintw(PAGEROW + 3, PAGECOL, "pages");
+	mvprintw(PAGEROW + 3, PAGECOL, "pages                     ");
+}
 void
 labelvmstat(void)
+{
 	int i;
 	/* Top few lines first */
 	labelvmstat_top();
 	/* Left hand column */
-	mvprintw(MEMROW, MEMCOL,     "              memory totals (in kB)");
+	mvprintw(MEMROW + 0, MEMCOL, "Anon                 %%   zero         ");
-	mvprintw(MEMROW + 1, MEMCOL, "           real   virtual      free");
+	mvprintw(MEMROW + 1, MEMCOL, "Exec                 %%   wired        ");
-	mvprintw(MEMROW + 2, MEMCOL, "Active");
+	mvprintw(MEMROW + 2, MEMCOL, "File                 %%   inact        ");
-	mvprintw(MEMROW + 3, MEMCOL, "All");
+	mvprintw(MEMROW + 3, MEMCOL, "Meta                 %%   bufs         ");
 	mvprintw(MEMROW + 4, MEMCOL, " (kB)        real   swaponly      free");
 	mvprintw(MEMROW + 5, MEMCOL, "Active                                ");
 	mvprintw(NAMEIROW, NAMEICOL, "Namei         Sys-cache     Proc-cache");
 	mvprintw(NAMEIROW + 1, NAMEICOL,
 		"    Calls     hits    %%     hits     %%");
-	mvprintw(DISKROW, DISKCOL, "Disks:");
+	mvprintw(DISKROW, DISKCOL, "%*s", DISKCOLWIDTH, "Disks:");
 	if (disk_horiz) {
 		mvprintw(DISKROW + 1, DISKCOL + 1, "seeks");
 		mvprintw(DISKROW + 2, DISKCOL + 1, "xfers");
 		mvprintw(DISKROW + 3, DISKCOL + 1, "bytes");
 		mvprintw(DISKROW + 4, DISKCOL + 1, "%%busy");
 	} else {
-		mvprintw(DISKROW, DISKCOL + 1 + 1 * DISKCOLWIDTH, "seeks");
+		mvprintw(DISKROW, DISKCOL + 1 * DISKCOLWIDTH, "%*s", DISKCOLWIDTH, "seeks");
-		mvprintw(DISKROW, DISKCOL + 1 + 2 * DISKCOLWIDTH, "xfers");
+		mvprintw(DISKROW, DISKCOL + 2 * DISKCOLWIDTH, "%*s", DISKCOLWIDTH, "xfers");
-		mvprintw(DISKROW, DISKCOL + 1 + 3 * DISKCOLWIDTH, "bytes");
+		mvprintw(DISKROW, DISKCOL + 3 * DISKCOLWIDTH, "%*s", DISKCOLWIDTH, "bytes");
-		mvprintw(DISKROW, DISKCOL + 1 + 4 * DISKCOLWIDTH, "%%busy");
+		mvprintw(DISKROW, DISKCOL + 4 * DISKCOLWIDTH, "%*s", DISKCOLWIDTH, "%%busy");
+	}
 	/* Middle column */
 	mvprintw(INTSROW, INTSCOL + 9, "Interrupts");
 	for (i = 0; i < nintr; i++) {
 		if (intrloc[i] == 0)
 			continue;
 		mvprintw(intrloc[i], INTSCOL + 9, "%-.*s",
 			INTSCOLEND - (INTSCOL + 9), intrname[i]);
+	}
 	for (i = 0; i < nevcnt; i++) {
 		if (ie_head[i].ie_loc == 0)
 @@ -386,27 +389,27 @@ labelvmstat(void)
 	mvprintw(VMSTATROW + 1, VMSTATCOL + 10, "fkppw");
 	mvprintw(VMSTATROW + 2, VMSTATCOL + 10, "fksvm");
 	mvprintw(VMSTATROW + 3, VMSTATCOL + 10, "pwait");
 	mvprintw(VMSTATROW + 4, VMSTATCOL + 10, "relck");
 	mvprintw(VMSTATROW + 5, VMSTATCOL + 10, "rlkok");
 	mvprintw(VMSTATROW + 6, VMSTATCOL + 10, "noram");
 	mvprintw(VMSTATROW + 7, VMSTATCOL + 10, "ndcpy");
 	mvprintw(VMSTATROW + 8, VMSTATCOL + 10, "fltcp");
 	mvprintw(VMSTATROW + 9, VMSTATCOL + 10, "zfod");
 	mvprintw(VMSTATROW + 10, VMSTATCOL + 10, "cow");
 	mvprintw(VMSTATROW + 11, VMSTATCOL + 10, "fmin");
 	mvprintw(VMSTATROW + 12, VMSTATCOL + 10, "ftarg");
 	mvprintw(VMSTATROW + 13, VMSTATCOL + 10, "itarg");
-	mvprintw(VMSTATROW + 14, VMSTATCOL + 10, "wired");
+	mvprintw(VMSTATROW + 14, VMSTATCOL + 10, "flnan");
 	mvprintw(VMSTATROW + 15, VMSTATCOL + 10, "pdfre");
 	if (LINES - 1 > VMSTATROW + 16)
 		mvprintw(VMSTATROW + 16, VMSTATCOL + 10, "pdscn");
+}
 #define X(s, s1, fld)	{temp = (s).fld[i]; (s).fld[i] -= (s1).fld[i]; \
 			if (display_mode == TIME) (s1).fld[i] = temp;}
 #define Z(s, s1, fld)	{temp = (s).nchstats.fld; \
 			(s).nchstats.fld -= (s1).nchstats.fld; \
 			if (display_mode == TIME) (s1).nchstats.fld = temp;}
 #define PUTRATE(s, s1, fld, l, c, w) \
 			{temp = (s).fld; (s).fld -= (s1).fld; \
 @@ -437,26 +440,31 @@ show_vmstat_top(vmtotal_t *Total, uvmexp
 	mvaddstr(STATROW, STATCOL + 53, buf);
 	putint(Total->t_rq - 1, PROCSROW + 1, PROCSCOL + 3, 3);
 	putint(Total->t_dw, PROCSROW + 1, PROCSCOL + 6, 3);
 	putint(Total->t_sl, PROCSROW + 1, PROCSCOL + 9, 3);
 	PUTRATE(us, us1, uvmexp->swtch, GENSTATROW + 1, GENSTATCOL - 1, 7);
 	PUTRATE(us, us1, uvmexp->traps, GENSTATROW + 1, GENSTATCOL + 7, 6);
 	PUTRATE(us, us1, uvmexp->syscalls, GENSTATROW + 1, GENSTATCOL + 14, 6);
 	PUTRATE(us, us1, uvmexp->intrs, GENSTATROW + 1, GENSTATCOL + 21, 5);
 	PUTRATE(us, us1, uvmexp->softs, GENSTATROW + 1, GENSTATCOL + 27, 6);
 	PUTRATE(us, us1, uvmexp->faults, GENSTATROW + 1, GENSTATCOL + 34, 6);
 	/*
 	 * XXX it sure would be nice if this did what top(1) does and showed
 	 * the utilization of each CPU on a separate line, though perhaps IFF
 	 * the screen is tall enough
 	 */
 	/* Last CPU state not calculated yet. */
 	for (f2 = 0.0, psiz = 0, c = 0; c < CPUSTATES; c++) {
 		i = cpuorder[c];
 		f1 = cputime(i);
 		f2 += f1;
 		l = (int) ((f2 + 1.0) / 2.0) - psiz;
 		if (c == 0)
 			putfloat(f1, GRAPHROW, GRAPHCOL + 1, 5, 1, 0);
 		else
 			putfloat(f1, GRAPHROW, GRAPHCOL + 10 * c + 1, 5, 1, 0);
 		mvhline(GRAPHROW + 2, psiz, cpuchar[c], l);
 		psiz += l;
+	}
 @@ -466,26 +474,31 @@ show_vmstat_top(vmtotal_t *Total, uvmexp
 	PUTRATE(us, us1, uvmexp->pgswapin, PAGEROW + 3, PAGECOL + 5, 5);
 	PUTRATE(us, us1, uvmexp->pgswapout, PAGEROW + 3, PAGECOL + 10, 5);
+}
 void
 showvmstat(void)
+{
 	int inttotal;
 	int i, l, r, c;
 	static int failcnt = 0;
 	static int relabel = 0;
 	static int last_disks = 0;
 	static char pigs[] = "pigs";
 	static u_long bufmem;
 	struct buf_sysctl *buffers;
 	int mib[6];
 	size_t size;
 	int extraslop = 0;
 	if (relabel) {
 		labelvmstat();
 		relabel = 0;
+	}
 	cpuswap();
 	if (display_mode == TIME) {
 		drvswap();
 		etime = cur.cp_etime;
 		/* < 5 ticks - ignore this trash */
 		if ((etime * hertz) < 1.0) {
 			if (failcnt++ <= MAXFAIL)
 @@ -497,36 +510,94 @@ showvmstat(void)
 			refresh();
 			failcnt = 0;
 			sleep(5);
 			command(pigs);
 			return;
+		}
 	} else
 		etime = 1.0;
 	show_vmstat_top(&s.Total, &s.uvmexp, &s1.uvmexp);
 	/* Memory totals */
 #define pgtokb(pg)	((pg) * (s.uvmexp.pagesize / 1024))
 	putint(pgtokb(s.uvmexp.active), MEMROW + 2, MEMCOL + 6, 9);
-	putint(pgtokb(s.uvmexp.active + s.uvmexp.swpginuse),	/* XXX */
+	putint(pgtokb(s.uvmexp.anonpages),				MEMROW + 0, MEMCOL + 7, 10);
-	    MEMROW + 2, MEMCOL + 16, 9);
+	putint((s.uvmexp.anonpages * 100 + 0.5) / s.uvmexp.npages,	MEMROW + 0, MEMCOL + 17, 4);
 	putint(pgtokb(s.uvmexp.npages - s.uvmexp.free),
-	    MEMROW + 3, MEMCOL + 6, 9);
+	putint(pgtokb(s.uvmexp.zeropages),				MEMROW + 0, MEMCOL + 30, 8);
 	putint(pgtokb(s.uvmexp.npages - s.uvmexp.free + s.uvmexp.swpginuse),
-	    MEMROW + 3, MEMCOL + 16, 9);
+	putint(pgtokb(s.uvmexp.execpages),				MEMROW + 1, MEMCOL + 7, 10);
-	putint(pgtokb(s.uvmexp.free), MEMROW + 2, MEMCOL + 26, 9);
+	putint((s.uvmexp.execpages * 100 + 0.5) / s.uvmexp.npages,	MEMROW + 1, MEMCOL + 17, 4);
 	putint(pgtokb(s.uvmexp.free + s.uvmexp.swpages - s.uvmexp.swpginuse),
-	    MEMROW + 3, MEMCOL + 26, 9);
+	putint(pgtokb(s.uvmexp.wired),					MEMROW + 1, MEMCOL + 30, 8);
 	putint(pgtokb(s.uvmexp.filepages),				MEMROW + 2, MEMCOL + 7, 10);
 	putint((s.uvmexp.filepages * 100 + 0.5) / s.uvmexp.npages,	MEMROW + 2, MEMCOL + 17, 4);
 	putint(pgtokb(s.uvmexp.inactive),				MEMROW + 2, MEMCOL + 30, 8);
 	/* Get total size of metadata buffers */
 	size = sizeof(bufmem);
 	if (sysctlbyname("vm.bufmem", &bufmem, &size, NULL, 0) < 0) {
 		error("can't get buffers size: %s\n", strerror(errno));
 		return;
+	}
 	/* Get number of metadata buffers */
 	size = 0;
 	buffers = NULL;
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_BUF;
 	mib[2] = KERN_BUF_ALL;
 	mib[3] = KERN_BUF_ALL;
 	mib[4] = (int)sizeof(struct buf_sysctl);
 	mib[5] = INT_MAX; /* we want them all */
 again:
 	if (sysctl(mib, 6, NULL, &size, NULL, 0) < 0) {
 		error("can't get buffers size: %s\n", strerror(errno));
 		return;
+	}
 	if (size == 0) {
 		error("buffers size is zero: %s\n", strerror(errno));
 		return;
+	}
 	size += extraslop * sizeof(struct buf_sysctl);
 	buffers = malloc(size);
 	if (buffers == NULL) {
 		error("can't allocate buffers: %s\n", strerror(errno));
 		return;
+	}
 	if (sysctl(mib, 6, buffers, &size, NULL, 0) < 0) {
 		free(buffers);
 		if (extraslop == 0) {
 			extraslop = 100;
 			goto again;
+		}
 		error("can't get buffers: %s\n", strerror(errno));
 		return;
+	}
 	free(buffers);			/* XXX there must be a better way! */
 	nbuf = size / sizeof(struct buf_sysctl);
 	putint((int) (bufmem / 1024),		MEMROW + 3, MEMCOL + 5, 12);
 	putint((int) ((bufmem * 100) + 0.5) / s.uvmexp.pagesize / s.uvmexp.npages,
 						MEMROW + 3, MEMCOL + 17, 4);
 	putint(nbuf,				MEMROW + 3, MEMCOL + 30, 8);
 	putint(pgtokb(s.uvmexp.active),		MEMROW + 5, MEMCOL + 7, 10);
 	putint(pgtokb(s.uvmexp.swpgonly),	MEMROW + 5, MEMCOL + 18, 10);
 	putint(pgtokb(s.uvmexp.free),		MEMROW + 5, MEMCOL + 28, 10);
 #undef pgtokb
 	/* Namei cache */
 	Z(s, s1, ncs_goodhits); Z(s, s1, ncs_badhits); Z(s, s1, ncs_miss);
 	Z(s, s1, ncs_long); Z(s, s1, ncs_pass2); Z(s, s1, ncs_2passes);
 	s.nchcount = s.nchstats.ncs_goodhits + s.nchstats.ncs_badhits +
 	    s.nchstats.ncs_miss + s.nchstats.ncs_long +
 	    s.nchstats.ncs_pass2 + s.nchstats.ncs_2passes;
 	if (display_mode == TIME)
 		s1.nchcount = s.nchcount;
 	putint(s.nchcount, NAMEIROW + 2, NAMEICOL, 9);
 	putint(s.nchstats.ncs_goodhits, NAMEIROW + 2, NAMEICOL + 9, 9);
 @@ -623,27 +694,27 @@ showvmstat(void)
 	PUTRATE(s, s1, uvmexp.forks_ppwait, VMSTATROW + 1, VMSTATCOL + 3, 6);
 	PUTRATE(s, s1, uvmexp.forks_sharevm, VMSTATROW + 2, VMSTATCOL + 3, 6);
 	PUTRATE(s, s1, uvmexp.fltpgwait, VMSTATROW + 3, VMSTATCOL + 4, 5);
 	PUTRATE(s, s1, uvmexp.fltrelck, VMSTATROW + 4, VMSTATCOL + 3, 6);
 	PUTRATE(s, s1, uvmexp.fltrelckok, VMSTATROW + 5, VMSTATCOL + 3, 6);
 	PUTRATE(s, s1, uvmexp.fltnoram, VMSTATROW + 6, VMSTATCOL + 3, 6);
 	PUTRATE(s, s1, uvmexp.fltamcopy, VMSTATROW + 7, VMSTATCOL + 3, 6);
 	PUTRATE(s, s1, uvmexp.flt_prcopy, VMSTATROW + 8, VMSTATCOL + 3, 6);
 	PUTRATE(s, s1, uvmexp.flt_przero, VMSTATROW + 9, VMSTATCOL + 3, 6);
 	PUTRATE(s, s1, uvmexp.flt_acow, VMSTATROW + 10, VMSTATCOL, 9);
 	putint(s.uvmexp.freemin, VMSTATROW + 11, VMSTATCOL, 9);
 	putint(s.uvmexp.freetarg, VMSTATROW + 12, VMSTATCOL, 9);
 	putint(s.uvmexp.inactarg, VMSTATROW + 13, VMSTATCOL, 9);
-	putint(s.uvmexp.wired, VMSTATROW + 14, VMSTATCOL, 9);
+	putint(s.uvmexp.fltnoanon, VMSTATROW + 14, VMSTATCOL, 9);
 	PUTRATE(s, s1, uvmexp.pdfreed, VMSTATROW + 15, VMSTATCOL, 9);
 	if (LINES - 1 > VMSTATROW + 16)
 		PUTRATE(s, s1, uvmexp.pdscans, VMSTATROW + 16, VMSTATCOL, 9);
+}
 void
 vmstat_boot(char *args)
+{
 	copyinfo(&z, &s1);
 	display_mode = BOOT;
+}
 @@ -766,27 +837,27 @@ getinfo(struct Info *stats)
 	int mib[2];
 	size_t size;
 	int i;
 	cpureadstats();
 	drvreadstats();
 	size = sizeof(stats->nchstats);
 	if (sysctlbyname("vfs.namecache_stats", &stats->nchstats, &size,
 	    NULL, 0) < 0) {
 		error("can't get namecache statistics: %s\n", strerror(errno));
 		memset(&stats->nchstats, 0, sizeof(stats->nchstats));
+	}
 	if (nintr)
-		NREAD(X_INTRCNT, stats->intrcnt, nintr * LONG);
+		NREAD(X_INTRCNT, stats->intrcnt, nintr * sizeof(long));
 	for (i = 0; i < nevcnt; i++)
 		KREAD(ie_head[i].ie_count, &stats->evcnt[i],
 		      sizeof stats->evcnt[i]);
 	size = sizeof(stats->uvmexp);
 	mib[0] = CTL_VM;
 	mib[1] = VM_UVMEXP2;
 	if (sysctl(mib, 2, &stats->uvmexp, &size, NULL, 0) < 0) {
 		error("can't get uvmexp: %s\n", strerror(errno));
 		memset(&stats->uvmexp, 0, sizeof(stats->uvmexp));
+	}
 	size = sizeof(stats->Total);
 	mib[0] = CTL_VM;
 	mib[1] = VM_METER;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bufcache.c,v 1.28 2017/06/09 00:13:29 chs Exp $	*/
+/*	$NetBSD: bufcache.c,v 1.29 2018/12/26 01:47:37 sevan Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Simon Burge.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: bufcache.c,v 1.28 2017/06/09 00:13:29 chs Exp $");
+__RCSID("$NetBSD: bufcache.c,v 1.29 2018/12/26 01:47:37 sevan Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/buf.h>
 #define __EXPOSE_MOUNT
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <uvm/uvm_extern.h>
 #include <err.h>
 #include <errno.h>
 @@ -107,28 +107,28 @@ closebufcache(WINDOW *w)
 	delwin(w);
 	ml_init();		/* Clear out mount list */
+}
 void
 labelbufcache(void)
+{
 	int i;
 	for (i = 0; i <= PAGEINFO_ROWS; i++) {
 		wmove(wnd, i, 0);
 		wclrtoeol(wnd);
+	}
-	mvwaddstr(wnd, PAGEINFO_ROWS + 1, 0, "File System          Bufs used"
+	mvwaddstr(wnd, PAGEINFO_ROWS + 1, 0,
-	    "   %   kB in use   %  Bufsize kB   %  Util %");
+"File System          Bufs used   %   kB in use   %  Bufsize kB   %  Util %");
 	wclrtoeol(wnd);
+}
 void
 showbufcache(void)
+{
 	int tbuf, i, lastrow;
 	double tvalid, tsize;
 	struct ml_entry *ml;
 	size_t len;
 	static int mib[] = { -1, 0 };
 	if (mib[0] == -1) {

 @@ -51,14 +51,13 @@ struct	command {
 	const char	*helptext;
 };
 #define	CF_INIT		0x1		/* been initialized */
 #define	CF_LOADAV	0x2		/* display w/ load average */
 #define	TCP	0x1
 #define	UDP	0x2
 #define KREAD(addr, buf, len)  kvm_ckread((addr), (buf), (len), # addr)
 #define NVAL(indx)  namelist[(indx)].n_value
 #define NPTR(indx)  (void *)NVAL((indx))
 #define NREAD(indx, buf, len) kvm_ckread(NPTR((indx)), (buf), (len), # indx)
 #define LONG	(sizeof (long))