 @@ -1,444 +1,444 @@
-/*	$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.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND 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 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>
 #include <inttypes.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdbool.h>
 #include <miscfs/specfs/specdev.h>
 #include "systat.h"
 #include "extern.h"
 #define VCACHE_SIZE	50
 #define	PAGEINFO_ROWS	 5
 struct vcache {
 	int vc_age;
 	struct vnode *vc_addr;
 	struct vnode vc_node;
 };
 struct ml_entry {
 	u_int ml_count;
 	u_long ml_size;
 	u_long ml_valid;
 	struct mount *ml_addr;
 	LIST_ENTRY(ml_entry) ml_entries;
 	struct mount ml_mount;
 };
 static struct vcache vcache[VCACHE_SIZE];
 static LIST_HEAD(mount_list, ml_entry) mount_list;
 static uint64_t bufmem;
 static u_int nbuf, pgwidth, kbwidth;
 static struct uvmexp_sysctl uvmexp;
 static void	vc_init(void);
 static void	ml_init(void);
 static struct 	vnode *vc_lookup(struct vnode *);
 static struct 	mount *ml_lookup(struct mount *, int, int);
 static void	fetchuvmexp(void);
 WINDOW *
 openbufcache(void)
+{
 	return (subwin(stdscr, -1, 0, 5, 0));
+}
 void
 closebufcache(WINDOW *w)
+{
 	if (w == NULL)
 		return;
 	wclear(w);
 	wrefresh(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) {
 		len = __arraycount(mib);
 		if (sysctlnametomib("vm.bufmem", mib, &len) == -1)
 			error("can't get \"vm.bufmem\" mib: %s",
 			    strerror(errno));
+	}
 	len = sizeof(bufmem);
 	if (sysctl(mib, 2, &bufmem, &len, NULL, 0) == -1)
 		error("can't get \"vm.bufmem\": %s", strerror(errno));
 	mvwprintw(wnd, 0, 0,
 	    "   %*d metadata buffers using             %*"PRIu64" kBytes of "
 	    "memory (%2.0f%%).",
 	    pgwidth, nbuf, kbwidth, bufmem / 1024,
 	    ((bufmem * 100.0) + 0.5) / getpagesize() / uvmexp.npages);
 	wclrtoeol(wnd);
 	mvwprintw(wnd, 1, 0,
 	    "   %*" PRIu64 " pages for cached file data using   %*"
 	    PRIu64 " kBytes of memory (%2.0f%%).",
 	    pgwidth, uvmexp.filepages,
 	    kbwidth, uvmexp.filepages * getpagesize() / 1024,
 	    (uvmexp.filepages * 100 + 0.5) / uvmexp.npages);
 	wclrtoeol(wnd);
 	mvwprintw(wnd, 2, 0,
 	    "   %*" PRIu64 " pages for executables using        %*"
 	    PRIu64 " kBytes of memory (%2.0f%%).",
 	    pgwidth, uvmexp.execpages,
 	    kbwidth, uvmexp.execpages * getpagesize() / 1024,
 	    (uvmexp.execpages * 100 + 0.5) / uvmexp.npages);
 	wclrtoeol(wnd);
 	mvwprintw(wnd, 3, 0,
 	    "   %*" PRIu64 " pages for anon (non-file) data     %*"
 	    PRIu64 " kBytes of memory (%2.0f%%).",
 	    pgwidth, uvmexp.anonpages,
 	    kbwidth, uvmexp.anonpages * getpagesize() / 1024,
 	    (uvmexp.anonpages * 100 + 0.5) / uvmexp.npages);
 	wclrtoeol(wnd);
 	mvwprintw(wnd, 4, 0,
 	    "   %*" PRIu64 " free pages                         %*"
 	    PRIu64 " kBytes of memory (%2.0f%%).",
 	    pgwidth, uvmexp.free,
 	    kbwidth, uvmexp.free * getpagesize() / 1024,
 	    (uvmexp.free * 100 + 0.5) / uvmexp.npages);
 	wclrtoeol(wnd);
 	if (nbuf == 0 || bufmem == 0) {
 		wclrtobot(wnd);
 		return;
+	}
 	tbuf = 0;
 	tvalid = tsize = 0;
 	lastrow = PAGEINFO_ROWS + 2;	/* Leave room for header. */
 	for (i = lastrow, ml = LIST_FIRST(&mount_list); ml != NULL;
 	    i++, ml = LIST_NEXT(ml, ml_entries)) {
 		int cnt = ml->ml_count;
 		double v = ml->ml_valid;
 		double s = ml->ml_size;
 		/* Display in window if enough room. */
 		if (i < getmaxy(wnd) - 2) {
 			mvwprintw(wnd, i, 0, "%-20.20s", ml->ml_addr == NULL ?
 			    "NULL" : ml->ml_mount.mnt_stat.f_mntonname);
 			wprintw(wnd,
 			    "    %6d %3d    %8ld %3.0f    %8ld %3.0f     %3.0f",
 			    cnt, (100 * cnt) / nbuf,
 			    (long)(v/1024), 100 * v / bufmem,
 			    (long)(s/1024), 100 * s / bufmem,
 * v / s);
 			wclrtoeol(wnd);
 			lastrow = i;
+		}
 		/* Update statistics. */
 		tbuf += cnt;
 		tvalid += v;
 		tsize += s;
+	}
 	wclrtobot(wnd);
 	mvwprintw(wnd, lastrow + 2, 0,
 	    "%-20s    %6d %3d    %8ld %3.0f    %8ld %3.0f     %3.0f",
 	    "Total:", tbuf, (100 * tbuf) / nbuf,
 	    (long)(tvalid/1024), 100 * tvalid / bufmem,
 	    (long)(tsize/1024), 100 * tsize / bufmem,
 	    tsize != 0 ? ((100 * tvalid) / tsize) : 0);
+}
 int
 initbufcache(void)
+{
 	fetchuvmexp();
 	pgwidth = (int)(floor(log10((double)uvmexp.npages)) + 1);
 	kbwidth = (int)(floor(log10(uvmexp.npages * getpagesize() / 1024.0)) +
 );
 	return(1);
+}
 static void
 fetchuvmexp(void)
+{
 	int mib[2];
 	size_t size;
 	/* Re-read pages used for vnodes & executables */
 	size = sizeof(uvmexp);
 	mib[0] = CTL_VM;
 	mib[1] = VM_UVMEXP2;
 	if (sysctl(mib, 2, &uvmexp, &size, NULL, 0) < 0) {
 		error("can't get uvmexp: %s\n", strerror(errno));
 		memset(&uvmexp, 0, sizeof(uvmexp));
+	}
+}
 void
 fetchbufcache(void)
+{
 	int count;
 	struct buf_sysctl *bp, *buffers;
 	struct vnode *vn;
 	struct ml_entry *ml;
 	int mib[6];
 	size_t size;
 	int extraslop = 0;
 	/* Re-read pages used for vnodes & executables */
 	fetchuvmexp();
 	/* Initialise vnode cache and mount list. */
 	vc_init();
 	ml_init();
 	/* Get 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)
 		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;
+	}
 	nbuf = size / sizeof(struct buf_sysctl);
 	for (bp = buffers; bp < buffers + nbuf; bp++) {
 		if (UINT64TOPTR(bp->b_vp) != NULL) {
 			struct mount *mp;
 			vn = vc_lookup(UINT64TOPTR(bp->b_vp));
 			if (vn == NULL)
 				break;
 			mp = vn->v_mount;
 			/*
 			 * References to mounted-on vnodes should be
 			 * counted towards the mounted filesystem.
 			 */
 			if (vn->v_type == VBLK && vn->v_specnode != NULL) {
 				specnode_t sn;
 				specdev_t sd;
 				if (!KREAD(vn->v_specnode, &sn, sizeof(sn)))
 					continue;
 				if (!KREAD(sn.sn_dev, &sd, sizeof(sd)))
 					continue;
 				if (sd.sd_mountpoint)
 					mp = sd.sd_mountpoint;
+			}
 			if (mp != NULL)
 				(void)ml_lookup(mp, bp->b_bufsize,
 				    bp->b_bcount);
+		}
+	}
 	/* simple sort - there's not that many entries */
 	do {
 		if ((ml = LIST_FIRST(&mount_list)) == NULL ||
 		    LIST_NEXT(ml, ml_entries) == NULL)
 			break;
 		count = 0;
 		for (ml = LIST_FIRST(&mount_list); ml != NULL;
 		    ml = LIST_NEXT(ml, ml_entries)) {
 			if (LIST_NEXT(ml, ml_entries) == NULL)
 				break;
 			if (ml->ml_count < LIST_NEXT(ml, ml_entries)->ml_count) {
 				ml = LIST_NEXT(ml, ml_entries);
 				LIST_REMOVE(ml, ml_entries);
 				LIST_INSERT_HEAD(&mount_list, ml, ml_entries);
 				count++;
+			}
+		}
 	} while (count != 0);
 	free(buffers);
+}
 static void
 vc_init(void)
+{
 	int i;
 	/* vc_addr == NULL for unused cache entry. */
 	for (i = 0; i < VCACHE_SIZE; i++)
 		vcache[i].vc_addr = NULL;
+}
 static void
 ml_init(void)
+{
 	struct ml_entry *ml;
 	/* Throw out the current mount list and start again. */
 	while ((ml = LIST_FIRST(&mount_list)) != NULL) {
 		LIST_REMOVE(ml, ml_entries);
 		free(ml);
+	}
+}
 static struct vnode *
 vc_lookup(struct vnode *vaddr)
+{
 	struct vnode *ret;
 	size_t i, oldest;
 	ret = NULL;
 	oldest = 0;
 	for (i = 0; i < VCACHE_SIZE; i++) {
 		if (vcache[i].vc_addr == NULL)
 			break;
 		vcache[i].vc_age++;
 		if (vcache[i].vc_age < vcache[oldest].vc_age)
 			oldest = i;
 		if (vcache[i].vc_addr == vaddr) {
 			vcache[i].vc_age = 0;
 			ret = &vcache[i].vc_node;
+		}
+	}
 	/* Find an entry in the cache? */
 	if (ret != NULL)
 		return(ret);
 	/* Go past the end of the cache? */
 	if  (i >= VCACHE_SIZE)
 		i = oldest;
 	/* Read in new vnode and reset age counter. */
 	if (KREAD(vaddr, &vcache[i].vc_node, sizeof(struct vnode)) == 0)
 		return NULL;
 	vcache[i].vc_addr = vaddr;
 	vcache[i].vc_age = 0;
 	return(&vcache[i].vc_node);
+}
 static struct mount *
 ml_lookup(struct mount *maddr, int size, int valid)
+{
 	struct ml_entry *ml;
 	for (ml = LIST_FIRST(&mount_list); ml != NULL;
 	    ml = LIST_NEXT(ml, ml_entries))
 		if (ml->ml_addr == maddr) {
 			ml->ml_count++;
 			ml->ml_size += size;
 			ml->ml_valid += valid;
 			if (ml->ml_addr == NULL)
 				return(NULL);
 			else
 				return(&ml->ml_mount);
+		}
 	if ((ml = malloc(sizeof(struct ml_entry))) == NULL) {
 		error("out of memory");
 		die(0);
+	}
 	LIST_INSERT_HEAD(&mount_list, ml, ml_entries);
 	ml->ml_count = 1;
 	ml->ml_size = size;
 	ml->ml_valid = valid;
 	ml->ml_addr = maddr;
 	if (maddr == NULL)
 		return(NULL);
 	KREAD(maddr, &ml->ml_mount, sizeof(struct mount));
 	return(&ml->ml_mount);
+}

 @@ -1,212 +1,213 @@
-/*	$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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 #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"},
 	{ "zero",	icmp_zero,	"re-zero running totals"},
 	{ .c_name = NULL }
 };
 struct command ifstat_commands[] = {
 	{ "scale",	ifstat_scale,	"modify scale of display"},
 	{ "pps",	ifstat_pps, 	"toggle packets per second display"},
 	{ "match",	ifstat_match,   "display matching interfaces"},
 	{ .c_name = NULL }
 };
 struct command	iostat_commands[] = {
 	{ "bars",	iostat_bars,	"show io stats as a bar graph"},
 	{ "numbers",	iostat_numbers,	"show io stats numerically"},
 	{ "secs",	iostat_secs,	"include time statistics"},
 	{ "rw",		iostat_rw,	"show read/write disk stats"},
 	{ "all",	iostat_all,	"show combined disk stats"},
 	/* from disks.c */
 	{ "display",	disks_add,	"add a disk to displayed disks"},
 	{ "ignore",	disks_remove,	"remove a disk from displayed disks"},
 	{ "drives",	disks_drives,	"list all disks/set disk list"},
 	{ .c_name = NULL }
 };
 struct command	ip_commands[] = {
 	{ "boot",	ip_boot,	"show total stats since boot"},
 	{ "run",	ip_run,		"show running total stats"},
 	{ "time",	ip_time,	"show stats for each sample time"},
 	{ "zero",	ip_zero,	"re-zero running totals"},
 	{ .c_name = NULL }
 };
 #ifdef INET6
 struct command	ip6_commands[] = {
 	{ "boot",	ip6_boot,	"show total stats since boot"},
 	{ "run",	ip6_run,	"show running total stats"},
 	{ "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"},
 	{ "time",	tcp_time,	"show stats for each sample time"},
 	{ "zero",	tcp_zero,	"re-zero running totals"},
 	{ .c_name = NULL }
 };
 struct command	vmstat_commands[] = {
 	{ "boot",	vmstat_boot,	"show total vm stats since boot"},
 	{ "run",	vmstat_run,	"show running total vm stats"},
 	{ "time",	vmstat_time,	"show vm stats for each sample time"},
 	{ "zero",	vmstat_zero,	"re-zero running totals"},
 	/* from disks.c */
 	{ "display",	disks_add,	"add a disk to displayed disks"},
 	{ "ignore",	disks_remove,	"remove a disk from displayed disks"},
 	{ "drives",	disks_drives,	"list all disks/set disk list"},
 	{ .c_name = NULL }
 };
 struct command	syscall_commands[] = {
 	{ "boot",	syscall_boot,	"show total syscall stats since boot"},
 	{ "run",	syscall_run,	"show running total syscall stats"},
 	{ "time",	syscall_time,	"show syscall stats for each sample time"},
 	{ "zero",	syscall_zero,	"re-zero running totals"},
 	{ "sort",	syscall_order,	"sort by [name|count|syscall]"},
 	{ "show",	syscall_show,	"show [count|time]"},
 	{ .c_name = NULL }
 };
 struct mode modes[] = {
 	/* "pigs" is the default, it must be first. */
 	{ "pigs",	showpigs,	fetchpigs,	labelpigs,
 	  initpigs,	openpigs,	closepigs,	0,
 	  CF_LOADAV },
 	{ "bufcache",	showbufcache,	fetchbufcache,	labelbufcache,
 	  initbufcache,	openbufcache,	closebufcache,	0,
 	  CF_LOADAV },
 	{ "df",         showdf,  	fetchdf,	labeldf,
 	  initdf,	opendf,		closedf,	df_commands,
 	  CF_LOADAV },
 	{ "ifstat",	showifstat,	fetchifstat,	labelifstat,
 	  initifstat,	openifstat,	closeifstat,	ifstat_commands,
 	  CF_LOADAV },
 	{ "inet.icmp",	showicmp,	fetchicmp,	labelicmp,
 	  initicmp,	openicmp,	closeicmp,	icmp_commands,
 	  CF_LOADAV },
 	{ "inet.ip",	showip,		fetchip,	labelip,
 	  initip,	openip,		closeip,	ip_commands,
 	  CF_LOADAV },
 	{ "inet.tcp",	showtcp,	fetchtcp,	labeltcp,
 	  inittcp,	opentcp,	closetcp,	tcp_commands,
 	  CF_LOADAV },
 	{ "inet.tcpsyn",showtcpsyn,	fetchtcp,	labeltcpsyn,
 	  inittcp,	opentcp,	closetcp,	tcp_commands,
 	  CF_LOADAV },
 #ifdef INET6
 	{ "inet6.ip6",	showip6,	fetchip6,	labelip6,
 	  initip6,	openip6,	closeip6,	ip6_commands,
 	  CF_LOADAV },
 #endif
 	{ "iostat",	showiostat,	fetchiostat,	labeliostat,
 	  initiostat,	openiostat,	closeiostat,	iostat_commands,
 	  CF_LOADAV },
 	{ "mbufs",	showmbufs,	fetchmbufs,	labelmbufs,
 	  initmbufs,	openmbufs,	closembufs,	0,
 	  CF_LOADAV },
 	{ "netstat",	shownetstat,	fetchnetstat,	labelnetstat,
 	  initnetstat,	opennetstat,	closenetstat,	netstat_commands,
 	  CF_LOADAV },
 	{ "ps",		showps,		fetchpigs,	labelps,
 	  initpigs,	openpigs,	closepigs,	ps_commands,
 	  CF_LOADAV },
 	{ "swap",	showswap,	fetchswap,	labelswap,
 	  initswap,	openswap,	closeswap,	0,
 	  CF_LOADAV },
 	{ "vmstat",	showvmstat,	fetchvmstat,	labelvmstat,
 	  initvmstat,	openvmstat,	closevmstat,	vmstat_commands,
 },
 	{ "syscall",	showsyscall,	fetchsyscall,	labelsyscall,
 	  initsyscall,	opensyscall,	closesyscall,	syscall_commands,
 },
 	{ .c_name = NULL }
 };
 struct  mode *curmode = &modes[0];

 @@ -1,417 +1,419 @@
-/*	$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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 #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>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #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 */
 static void (*sv_stop_handler)(int);
 static void stop(int);
 __dead static void usage(void);
 gid_t egid; /* XXX needed by initiostat() and initkre() */
 int
 main(int argc, char **argv)
+{
 	int ch;
 	char errbuf[_POSIX2_LINE_MAX];
 	const char *all;
 	struct clockinfo clk;
 	size_t len;
 	int bflag = 0;
 	all = "all";
 	egid = getegid();
 	(void)setegid(getgid());
 	while ((ch = getopt(argc, argv, "M:N:bnw:t:")) != -1)
 		switch(ch) {
 		case 'M':
 			memf = optarg;
 			break;
 		case 'N':
 			nlistf = optarg;
 			break;
 		case 'b':
 			bflag = !bflag;
 			break;
 		case 'n':
 			nflag = !nflag;
 			break;
 		case 't':
 			if ((turns = atoi(optarg)) <= 0)
 				errx(1, "turns <= 0.");
 			break;
 		case 'w':
 			if ((naptime = strtod(optarg, NULL)) <= 0)
 				errx(1, "interval <= 0.");
 			break;
 		case '?':
 		default:
 			usage();
+		}
 	argc -= optind;
 	argv += optind;
 	for ( ; argc > 0; argc--, argv++) {
 		struct mode *p;
 		int modefound = 0;
 		if (isdigit((unsigned char)argv[0][0])) {
 			naptime = strtod(argv[0], NULL);
 			if (naptime <= 0)
 				naptime = 5;
 			continue;
+		}
 		for (p = modes; p->c_name ; p++) {
 			if (strstr(p->c_name, argv[0]) == p->c_name) {
 				curmode = p;
 				modefound++;
 				break;
+			}
 			if (strstr(all, argv[0]) == all) {
 				allcounter=0;
 				allflag=1;
+			}
+		}
 		if (!modefound && !allflag)
 			error("%s: Unknown command.", argv[0]);
+	}
 	/*
 	 * 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);
 	if (sysctlbyname("vm.maxslp", &maxslp, &len, NULL, 0))
 		error("can't get \"vm.maxslp\": %s", strerror(errno));
 	(*curmode->c_init)();
 	curmode->c_flags |= CF_INIT;
 	labels();
 	dellave = 0.0;
 	display(0);
 	if (!bflag) {
 		noecho();
 		cbreak();
 		keyboard();
 	} else
 		die(0);
 	/*NOTREACHED*/
+}
 static void
 usage(void)
+{
 	fprintf(stderr, "usage: systat [-bn] [-M core] [-N system] [-w wait] "
 		"[-t turns]\n\t\t[display] [refresh-interval]\n");
 	exit(1);
+}
 void
 labels(void)
+{
 	if (curmode->c_flags & CF_LOADAV) {
 		mvaddstr(2, 20,
 		    "/0   /1   /2   /3   /4   /5   /6   /7   /8   /9   /10");
 		mvaddstr(3, 5, "Load Average");
+	}
 	(*curmode->c_label)();
 #ifdef notdef
 	mvprintw(21, 25, "CPU usage on %s", hostname);
 #endif
 	refresh();
+}
 void
 display(int signo)
+{
 	static int skip;
 	int j;
 	struct mode *p;
 	int ms_delay;
 	if (signo == SIGALRM && skip-- > 0)
 		/* Don't display on this timeout */
 		return;
 	/* Get the load average over the last minute. */
 	(void)getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0]));
 	(*curmode->c_fetch)();
 	if (curmode->c_flags & CF_LOADAV) {
 		j = 5.0*avenrun[0] + 0.5;
 		dellave -= avenrun[0];
 		if (dellave >= 0.0)
 			c = '<';
 		else {
 			c = '>';
 			dellave = -dellave;
+		}
 		if (dellave < 0.1)
 			c = '|';
 		dellave = avenrun[0];
 		wmove(wload, 0, 0);
 		wclrtoeol(wload);
 		whline(wload, c, (j > 50) ? 50 : j);
 		if (j > 50)
 			wprintw(wload, " %4.1f", avenrun[0]);
+	}
 	(*curmode->c_refresh)();
 	if (curmode->c_flags & CF_LOADAV)
 		wrefresh(wload);
 	wrefresh(wnd);
 	move(CMDLINE, col);
 	refresh();
 	if (allflag && signo==SIGALRM) {
 		if (allcounter >= turns){
 			p = curmode;
 			p++;
 			if (p->c_name == NULL)
 				p = modes;
 			switch_mode(p);
 			allcounter=0;
 		} else
 			allcounter++;
+	}
 	/* curses timeout() uses VTIME, limited to 255 1/10th secs */
 	ms_delay = naptime * 1000;
 	if (ms_delay < 25500) {
 		timeout(ms_delay);
 		skip = 0;
 	} else {
 		skip = ms_delay / 25500;
 		timeout(ms_delay / (skip + 1));
+	}
+}
 void
 redraw(void)
+{
 	resizeterm(LINES, COLS);
 	CMDLINE = LINES - 1;
 	labels();
 	display(0);
 	needsredraw = 0;
+}
 static void
 stop(int signo)
+{
 	sigset_t set;
 	signal(SIGTSTP, sv_stop_handler);
 	/* unblock SIGTSTP */
 	sigemptyset(&set);
 	sigaddset(&set, SIGTSTP);
 	sigprocmask(SIG_UNBLOCK, &set, NULL);
 	/* stop ourselves */
 	kill(0, SIGTSTP);
 	/* must have been restarted */
 	signal(SIGTSTP, stop);
 	needsredraw = signo;
+}
 void
 die(int signo)
+{
 	move(CMDLINE, 0);
 	clrtoeol();
 	refresh();
 	endwin();
 	exit(0);
+}
 void
 error(const char *fmt, ...)
+{
 	va_list ap;
 	char buf[255];
 	int oy, ox;
 	va_start(ap, fmt);
 	if (wnd) {
 		getyx(stdscr, oy, ox);
 		(void) vsnprintf(buf, sizeof(buf), fmt, ap);
 		clrtoeol();
 		standout();
 		mvaddstr(CMDLINE, 0, buf);
 		standend();
 		move(oy, ox);
 		refresh();
 	} else {
 		(void) vfprintf(stderr, fmt, ap);
 		fprintf(stderr, "\n");
+	}
 	va_end(ap);
+}
 void
 clearerror(void)
+{
 	error("%s", "");
+}
 void
 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,635 +1,709 @@
-.\"	$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
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" 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
 .Op Ar refresh-interval
 .Sh DESCRIPTION
 .Nm
 displays various system statistics in a screen oriented fashion
 using the curses screen display library,
 .Xr curses 3 .
 .Pp
 While
 .Nm
 is running the screen is usually divided into two windows (an exception
 is the vmstat display which uses the entire screen).
 The upper window depicts the current system load average.
 The information displayed in the lower window may vary, depending on
 user commands.
 The last line on the screen is reserved for user input and error messages.
 .Pp
 By default
 .Nm
 displays the processes getting the largest percentage of the processor
 in the lower window.
 Other displays show more detailed process information,
 swap space usage,
 disk usage statistics (a la
 .Xr df 1 ) ,
 disk
 .Tn I/O
 statistics (a la
 .Xr iostat 8 ) ,
 virtual memory statistics (a la
 .Xr vmstat 1 ) ,
 network ``mbuf'' utilization, network 'ifstat' traffic, and network connections (a la
 .Xr netstat 1 ) .
 .Pp
 Input is interpreted at two different levels.
 A ``global'' command interpreter processes all keyboard input.
 If this command interpreter fails to recognize a command, the
 input line is passed to a per-display command interpreter.
 This allows each display to have certain display-specific commands.
 .Pp
 Command line options:
 .Bl -tag -width "refresh_interval"
 .It Fl M Ar core
 Extract values associated with the name list from
 .Ar core
 instead of the default
 .Pa /dev/mem .
 .It Fl N Ar system
 Extract the name list from
 .Ar system
 instead of the default
 .Pa /netbsd .
 .It Fl b
 Show the chosen display once and exit.
 .It Fl n
 Do not resolve IP addresses into string hostnames
 .Pq FQDNs
 on
 .Ic netstat .
 It has the same effect as
 .Ic numbers
 subcommand in
 .Ic netstat .
 .It Fl w Ar wait
 See
 .Ar refresh-interval .
 .It Fl t Ar turns
 How many refreshes to show each screen in 'all' display mode.
 .It Ar display
 The
 .Ar display
 argument expects to be one of:
 .Ic all ,
 .Ic bufcache ,
 .Ic df ,
 .Ic ifstat ,
 .Ic inet.icmp ,
 .Ic inet.ip ,
 .Ic inet.tcp ,
 .Ic inet.tcpsyn ,
 .Ic inet6.ip6 ,
 .Ic iostat ,
 .Ic mbufs ,
 .Ic netstat ,
 .Ic pigs ,
 .Ic ps ,
 .Ic swap ,
 .Ic syscall
 or
 .Ic vmstat .
 These displays can also be requested interactively and are described in
 full detail below.
 .It Ar refresh-interval
 The
 .Ar refresh-interval
 specifies the screen refresh time interval in seconds.
 This is provided for backwards compatibility, and overrides the
 .Ar refresh-interval
 specified with the
 .Fl w
 flag.
 .El
 .Pp
 Certain characters cause immediate action by
 .Nm  .
 These are
 .Bl -tag -width Fl
 .It Ic \&^L
 Refresh the screen.
 .It Ic \&^G
 Print the name of the current ``display'' being shown in
 the lower window and the refresh interval.
 .It Ic \&^Z
 Stop
 .Nm  .
 .It Ic \&? , Ic h
 Print the names of the available displays on the command line.
 .It Ic \&:
 Move the cursor to the command line and interpret the input
 line typed as a command.
 While entering a command the current character erase, word erase,
 and line kill characters may be used.
 .El
 .Pp
 The following commands are interpreted by the ``global''
 command interpreter.
 .Bl -tag -width Fl
 .It Ic help Ar key
 Print the names of the available displays on the command line.
 It will print long names as
 .Dq Ic inet.* .
 To print items under
 .Dq Ic inet ,
 give
 .Ic inet
 as
 .Ar key .
 .It Ic load
 Print the load average over the past 1, 5, and 15 minutes
 on the command line.
 .It Ic stop
 Stop refreshing the screen.
 .It Oo Ic start Oc Oo Ar number Oc
 Start (continue) refreshing the screen.
 If a second, numeric, argument is provided it is interpreted as a
 refresh interval in seconds.
 Supplying only a number will set the refresh interval to this
 value.
 .It Ic quit
 Exit
 .Nm  .
 (This may be abbreviated to
 .Ic q  . )
 .El
 .Pp
 The available displays are:
 .Bl -tag -width Ic
 .It Ic all
 Cycle through all displays automatically.
 At each display, wait some
 refresh-turns, then switch to the next display.
 Duration of one refresh-turn is adjustable with the
 .Fl w
 option, number of refresh-turns can be changed with the
 .Fl t
 option.
 .It Ic bufcache
 Display, in the lower window, statistics about the file system buffers.
 Statistics for each file system that has active buffers include the number
 of buffers for that file system, the number of active kilobytes in those
 buffers and the total size of the buffers for that file system.
 .It Ic df
 Lists disk usage statistics for all filesystems,
 including the available free space as well as a bar
 graph indicating the used capacity.
 .Pp
 The following commands are specific to the
 .Ic df
 display:
 .Pp
 .Bl -tag -width Fl -compact
 .It Cm all
 Displays information for all filesystems, including
 kernfs, procfs and null-mounts.
 .It Cm some
 Suppress information about procfs, kernfs and null-mounts (default).
 .El
 .It Ic ifstat
 Display the network traffic going through active interfaces on the
 system.
 Idle interfaces will not be displayed until they receive some
 traffic.
 .Pp
 For each interface being displayed, the current, peak and total
 statistics are displayed for incoming and outgoing traffic.
 By default,
 the
 .Ic ifstat
 display will automatically scale the units being used so that they are
 in a human-readable format.
 The scaling units used for the current and
 peak
 traffic columns can be altered by the
 .Ic scale
 command.
 .Bl -tag -width ".Cm scale Op Ar units"
 .It Cm scale Op Ar units
 Modify the scale used to display the current and peak traffic over all
 interfaces.
 The following units are recognised: kbit, kbyte, mbit,
 mbyte, gbit, gbyte and auto.
 .It Cm pps
 Show statistics in packets per second instead of bytes/bits per second.
 A subsequent call of
 .Ic pps
 switches this mode off.
 .It Cm match Op Ar patterns
 Display only interfaces that match pattern provided as an argument.
 Patterns should be in shell syntax separated by whitespaces or commas.
 If this command is called without arguments then all interfaces are displayed.
 For example:
 .Pp
 .Dl match re0, bge1
 .Pp
 This will display re0 and bge1 interfaces.
 .Pp
 .Dl match re*, bge*, lo0
 .Pp
 This will display all
 .Ic re
 interfaces, all
 .Ic bge
 interfaces and the loopback interface.
 .El
 .Pp
 .It Ic inet.icmp
 Display ICMP statistics.
 .It Ic inet.ip
 Display IPv4 and UDP statistics.
 .It Ic inet.tcp
 Display TCP statistics.
 .It Ic inet.tcpsyn
 Display statistics about the
 .Tn TCP
 ``syncache''.
 .It Ic inet6.ip6
 Display IPv6 statistics.
 .It Ic iostat
 Display, in the lower window, statistics about processor use
 and disk throughput.
 Statistics on processor use appear as bar graphs of the amount of
 time executing in user mode (``user''), in user mode running low
 priority processes (``nice''), in system mode (``system''), and
 idle (``idle'').
 Statistics on disk throughput show, for each drive, kilobytes of
 data transferred, number of disk transactions performed, and time
 spent in disk accesses in milliseconds.
 This information may be displayed as bar graphs or as rows of
 numbers which scroll downward.
 Bar graphs are shown by default;
 .Pp
 The following commands are specific to the
 .Ic iostat
 display; the minimum unambiguous prefix may be supplied.
 .Pp
 .Bl -tag -width Fl -compact
 .It Cm numbers
 Show the disk
 .Tn I/O
 statistics in numeric form.
 Values are
 displayed in numeric columns which scroll downward.
 .It Cm bars
 Show the disk
 .Tn I/O
 statistics in bar graph form (default).
 .It Cm secs
 Toggle the display of time in disk activity (the default is to
 not display time).
 .It Cm all
 Show the read and write statistics combined (default).
 .It Cm rw
 Show the read and write statistics separately.
 .El
 .It Ic mbufs
 Display, in the lower window, the number of mbufs allocated
 for particular uses, i.e. data, socket structures, etc.
 .It Ic netstat
 Display, in the lower window, network connections.
 By default, network servers awaiting requests are not displayed.
 Each address is displayed in the format ``host.port'', with each
 shown symbolically, when possible.
 It is possible to have addresses displayed numerically,
 limit the display to a set of ports, hosts, and/or protocols
 (the minimum unambiguous prefix may be supplied):
 .Pp
 .Bl -tag -width Ar -compact
 .It Cm all
 Toggle the displaying of server processes awaiting requests (this
 is the equivalent of the
 .Fl a
 flag to
 .Ar netstat  1  ) .
 .It Cm numbers
 Display network addresses numerically.
 .It Cm names
 Display network addresses symbolically.
 .It Ar protocol
 Display only network connections using the indicated protocol
 (currently either ``tcp'' or ``udp'').
 .It Cm ignore Op Ar items
 Do not display information about connections associated with
 the specified hosts or ports.
 Hosts and ports may be specified by name (``vangogh'', ``ftp''),
 or numerically.
 Host addresses use the Internet dot notation (``128.32.0.9'').
 Multiple items may be specified with a single command by separating
 them with spaces.
 .It Cm display Op Ar items
 Display information about the connections associated with the
 specified hosts or ports.
 As for
 .Ar ignore  ,
 .Op Ar items
 may be names or numbers.
 .It Cm show Op Ar ports\&|hosts
 Show, on the command line, the currently selected protocols,
 hosts, and ports.
 Hosts and ports which are being ignored are prefixed with a `!'.
 If
 .Ar ports
 or
 .Ar hosts
 is supplied as an argument to
 .Cm show  ,
 then only the requested information will be displayed.
 .It Cm reset
 Reset the port, host, and protocol matching mechanisms to the default
 (any protocol, port, or host).
 .El
 .It Ic pigs
 Display, in the lower window, those processes which are getting the
 largest portion of the processor (the default display).
 When less than 100% of the
 processor is scheduled to user processes, the remaining time
 is accounted to the ``idle'' process.
 .It Ic ps
 Display, in the lower window, the same information provided
 by the command
 .Xr ps 1
 with the flags
 .Fl aux .
 .Pp
 The following command is specific to the
 .Ic ps
 display; the minimum unambiguous prefix may be supplied.
 .Pp
 .Bl -tag -width Fl -compact
 .It Cm user Ar name
 Limit the list of processes displayed to those owned by user
 .Ar name .
 If
 .Ar name
 is specified as `+', processes owned by any user are displayed (default).
 .El
 .It Ic swap
 Show information about swap space usage on all the
 swap areas configured with
 .Xr swapctl 8 .
 The first column is the device name of the partition.
 The next column is the total space available in the partition.
 The
 .Ar Used
 column indicates the total blocks used so far;
 the graph shows the percentage of space in use on each partition.
 If there are more than one swap partition in use,
 a total line is also shown.
 Areas known to the kernel, but not in use are shown as not available.
 .It Ic syscall
 Show per system call statistics.
 The display consists of several columns of system call name and counts.
 .Pp
 In order to stop entries moving around the screen too much, an infinite
 response filter is applied to the values before they are sorted.
 .Pp
 The following commands are specific to the
 .Ic syscall
 display:
 .Pp
 .Bl -tag -width Ar -compact
 .It Ic sort Ic name
 Sort display by the syscall name (default).
 .It Ic sort Ic count
 Sort display by the count of calls or time spent in the calls.
 .It Ic sort Ic syscall
 Sort display be syscall number.
 .It Ic show Ic count
 Show the number of times the system call has be called (default).
 .It Ic show Ic time
 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,
 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.
 If there are more than five disks, and the terminal window has more
 than 24 lines, the disks display will be flipped so that more
 of the disk statistics are visible.
 .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
 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
 by device basis.
 Only devices that have interrupted at least once since boot time are shown.
 .El
 .Pp
 Commands to switch between displays may be abbreviated to the
 minimum unambiguous prefix; for example, ``io'' for ``iostat''.
 Certain information may be discarded when the screen size is
 insufficient for display.
 For example, on a machine with 10 drives the
 .Ic iostat
 bar graph displays only 3 drives on a 24 line terminal.
 When a bar graph would overflow the allotted screen space it is
 truncated and the actual value is printed ``over top'' of the bar.
 .Pp
 The following commands are common to each display which shows
 information about disk drives.
 These commands are used to select a set of drives to report on,
 should your system have more drives configured than can normally
 be displayed on the screen.
 Drives may be specified as drive names or as patterns specified in the
 notation described by
 .Xr fnmatch 3 .
 .Pp
 .Bl -tag -width Ar -compact
 .It Cm display Op Ar drives
 Display information about the drives indicated.
 Multiple drives may be specified, separated by spaces.
 .It Cm ignore Op Ar drives
 Do not display information about the drives indicated.
 Multiple drives may be specified, separated by spaces.
 .It Cm drives Op Ar drives
 With no arguments, display a list of available drives.
 With arguments, replace the list of currently displayed drives
 with the ones specified.
 .El
 .Pp
 The following commands are specific to the
 .Ic inet.* ,
 .Ic inet6.* ,
 .Ic syscall
 and
 .Ic vmstat
 displays; the minimum unambiguous prefix may be supplied.
 .Pp
 .Bl -tag -width Ar -compact
 .It Cm boot
 Display cumulative statistics since the system was booted.
 .It Cm run
 Display statistics as a running total from the point this
 command is given.
 .It Cm time
 Display statistics averaged over the refresh interval (the default).
 .It Cm zero
 Reset running statistics to zero.
 .El
 .Sh FILES
 .Bl -tag -width /etc/networks -compact
 .It Pa /netbsd
 For the namelist.
 .It Pa /dev/kmem
 For information in main memory.
 .It Pa /etc/hosts
 For host names.
 .It Pa /etc/networks
 For network names.
 .It Pa /etc/services
 For port names.
 .El
 .Sh NOTES
 Much of the information that
 .Nm
 .Ic vmstat
 uses is obtained from
 .Cm struct vmmeter cnt .
 .Sh SEE ALSO
 .Xr df 1 ,
 .Xr netstat 1 ,
 .Xr ps 1 ,
 .Xr top 1 ,
 .Xr vmstat 1 ,
 .Xr iostat 8 ,
 .Xr pstat 8
 .Sh HISTORY
 The
 .Nm
 program appeared in
 .Bx 4.3 .
 .Sh BUGS
 Consumes CPU resources and thus may skew statistics.
 .Pp
 Certain displays presume a minimum of 80 characters per line.
 .Pp
 The
 .Ic vmstat
 display looks out of place because it is (it was added in as
 a separate display from what used to be a different program).
 .Pp
 The
 .Fl b
 option requires a real terminal and could be converted to
 simply output to standard output.

 @@ -1,859 +1,930 @@
-/*	$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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * 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.
  */
 #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>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <util.h>
 #include "systat.h"
 #include "extern.h"
 #include "drvstats.h"
 #include "utmpentry.h"
 #include "vmstat.h"
 static struct Info {
 	struct	uvmexp_sysctl uvmexp;
 	struct	vmtotal Total;
 	struct	nchstats nchstats;
 	long	nchcount;
 	long	*intrcnt;
 	u_int64_t	*evcnt;
 } s, s1, s2, z;
 enum display_mode display_mode = TIME;
 static void allocinfo(struct Info *);
 static void copyinfo(struct Info *, struct Info *);
 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;
 	wclear(w);
 	wrefresh(w);
+}
 static struct nlist namelist[] = {
 #define	X_INTRNAMES	0
 	{ .n_name = "_intrnames" },
 #define	X_EINTRNAMES	1
 	{ .n_name = "_eintrnames" },
 #define	X_INTRCNT	2
 	{ .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)
+{
 	struct evcntlist allevents;
 	struct evcnt evcnt, *evptr;
 	intr_evcnt_t *ie;
 	intr_evcnt_t *n;
 	if (!NREAD(X_ALLEVENTS, &allevents, sizeof allevents))
 		return;
 	evptr = TAILQ_FIRST(&allevents);
 	for (; evptr != NULL; evptr = TAILQ_NEXT(&evcnt, ev_list)) {
 		if (!KREAD(evptr, &evcnt, sizeof evcnt))
 			return;
 		if (evcnt.ev_type != EVCNT_TYPE_INTR)
 			continue;
 		n = realloc(ie_head, sizeof *ie * (nevcnt + 1));
 		if (n == NULL) {
 			error("realloc failed");
 			die(0);
+		}
 		ie_head = n;
 		ie = ie_head + nevcnt;
 		ie->ie_group = malloc(evcnt.ev_grouplen + 1);
 		ie->ie_name = malloc(evcnt.ev_namelen + 1);
 		if (ie->ie_group == NULL || ie->ie_name == NULL)
 			return;
 		if (!KREAD(evcnt.ev_group, ie->ie_group, evcnt.ev_grouplen + 1))
 			return;
 		if (!KREAD(evcnt.ev_name, ie->ie_name, evcnt.ev_namelen + 1))
 			return;
 		ie->ie_count = &evptr->ev_count;
 		ie->ie_loc = 0;
 		nevcnt++;
+	}
+}
 int
 initvmstat(void)
+{
 	static char *intrnamebuf;
 	char *cp;
 	int i;
 	if (intrnamebuf)
 		free(intrnamebuf);
 	if (intrname)
 		free(intrname);
 	if (intrloc)
 		free(intrloc);
 	if (namelist[0].n_type == 0) {
 		if (kvm_nlist(kd, namelist) &&
 		    namelist[X_ALLEVENTS].n_type == 0) {
 			nlisterr(namelist);
 			return(0);
+		}
+	}
 	hertz = stathz ? stathz : hz;
 	if (!drvinit(1))
 		return(0);
 	/* Old style interrupt counts - deprecated */
 	nintr = (namelist[X_EINTRCNT].n_value -
 		namelist[X_INTRCNT].n_value) / sizeof (long);
 	if (nintr) {
 		intrloc = calloc(nintr, sizeof (long));
 		intrname = calloc(nintr, sizeof (long));
 		intrnamebuf = malloc(namelist[X_EINTRNAMES].n_value -
 				     namelist[X_INTRNAMES].n_value);
 		if (intrnamebuf == NULL || intrname == 0 || intrloc == 0) {
 			error("Out of memory\n");
 			nintr = 0;
 			return(0);
+		}
 		NREAD(X_INTRNAMES, intrnamebuf, NVAL(X_EINTRNAMES) -
 		      NVAL(X_INTRNAMES));
 		for (cp = intrnamebuf, i = 0; i < nintr; i++) {
 			intrname[i] = cp;
 			cp += strlen(cp) + 1;
+		}
+	}
 	/* event counter interrupt counts */
 	get_interrupt_events();
 	nextintsrow = INTSROW + 1;
 	allocinfo(&s);
 	allocinfo(&s1);
 	allocinfo(&s2);
 	allocinfo(&z);
 	getinfo(&s2);
 	copyinfo(&s2, &s1);
 	return(1);
+}
 void
 fetchvmstat(void)
+{
 	time_t now;
 	time(&now);
 	strlcpy(buf, ctime(&now), sizeof(buf));
 	buf[19] = '\0';
 	getinfo(&s);
+}
 static void
 print_ie_title(int i)
+{
 	int width, name_width, group_width;
 	width = INTSCOLEND - (INTSCOL + 9);
 	if (width <= 0)
 		return;
 	move(ie_head[i].ie_loc, INTSCOL + 9);
 	group_width = strlen(ie_head[i].ie_group);
 	name_width = strlen(ie_head[i].ie_name);
 	width -= group_width + 1 + name_width;
 	if (width < 0) {
 		/*
 		 * Screen to narrow for full strings
 		 * This is all rather horrid, in some cases there are a lot
 		 * of events in the same group, and in others the event
 		 * name is "intr".  There are also names which need 7 or 8
 		 * columns before they become meaningful.
 		 * This is a bad compromise.
 		 */
 		width = -width;
 		group_width -= (width + 1) / 2;
 		name_width -= width / 2;
 		/* some have the 'useful' name "intr", display their group */
 		if (strcasecmp(ie_head[i].ie_name, "intr") == 0) {
 			 group_width += name_width + 1;
 			 name_width = 0;
 		} else {
 			if (group_width <= 3 || name_width < 0) {
 				/* don't display group */
 				name_width += group_width + 1;
 				group_width = 0;
+			}
+		}
+	}
 	if (group_width != 0) {
 		printw("%-.*s", group_width, ie_head[i].ie_group);
 		if (name_width != 0)
 			printw(" ");
+	}
 	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)
 			continue;
 		print_ie_title(i);
+	}
 	/* Right hand column */
 	mvprintw(VMSTATROW + 0, VMSTATCOL + 10, "forks");
 	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; \
 			if (display_mode == TIME) (s1).fld = temp; \
 			putint((int)((float)(s).fld/etime + 0.5), l, c, w);}
 #define MAXFAIL 5
 static	char cpuchar[CPUSTATES] = { '=' , '>', '-', '%', ' ' };
 static	char cpuorder[CPUSTATES] = { CP_SYS, CP_USER, CP_NICE, CP_INTR, CP_IDLE };
 void
 show_vmstat_top(vmtotal_t *Total, uvmexp_sysctl_t *uvm, uvmexp_sysctl_t *uvm1)
+{
 	float f1, f2;
 	int psiz;
 	int i, l, c;
 	struct {
 		struct uvmexp_sysctl *uvmexp;
 	} us, us1;
 	us.uvmexp = uvm;
 	us1.uvmexp = uvm1;
 	putint(ucount(), STATROW, STATCOL, 3);
 	putfloat(avenrun[0], STATROW, STATCOL + 17, 6, 2, 0);
 	putfloat(avenrun[1], STATROW, STATCOL + 23, 6, 2, 0);
 	putfloat(avenrun[2], STATROW, STATCOL + 29, 6, 2, 0);
 	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;
+	}
 	PUTRATE(us, us1, uvmexp->pageins, PAGEROW + 2, PAGECOL + 5, 5);
 	PUTRATE(us, us1, uvmexp->pdpageouts, PAGEROW + 2, PAGECOL + 10, 5);
 	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)
 				return;
 			clear();
 			mvprintw(2, 10, "The alternate system clock has died!");
 			mvprintw(3, 10, "Reverting to ``pigs'' display.");
 			move(CMDLINE, 0);
 			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);
 #define nz(x)	((x) ? (x) : 1)
 	putfloat(s.nchstats.ncs_goodhits * 100.0 / nz(s.nchcount),
 	   NAMEIROW + 2, NAMEICOL + 19, 4, 0, 1);
 	putint(s.nchstats.ncs_pass2, NAMEIROW + 2, NAMEICOL + 23, 9);
 	putfloat(s.nchstats.ncs_pass2 * 100.0 / nz(s.nchcount),
 	   NAMEIROW + 2, NAMEICOL + 34, 4, 0, 1);
 #undef nz
 	/* Disks */
 	for (l = 0, i = 0, r = DISKROW, c = DISKCOL;
 	     i < (int)ndrive; i++) {
 		if (!drv_select[i])
 			continue;
 		if (disk_horiz)
 			c += DISKCOLWIDTH;
 		else
 			r++;
 		if (c + DISKCOLWIDTH > DISKCOLEND) {
 			if (disk_horiz && LINES - 1 - DISKROW >
 			    (DISKCOLEND - DISKCOL) / DISKCOLWIDTH) {
 				disk_horiz = 0;
 				relabel = 1;
+			}
 			break;
+		}
 		if (r >= LINES - 1) {
 			if (!disk_horiz && LINES - 1 - DISKROW <
 			    (DISKCOLEND - DISKCOL) / DISKCOLWIDTH) {
 				disk_horiz = 1;
 				relabel = 1;
+			}
 			break;
+		}
 		l++;
 		dinfo(i, r, c);
+	}
 	/* blank out if we lost any disks */
 	for (i = l; i < last_disks; i++) {
 		int j;
 		if (disk_horiz)
 			c += DISKCOLWIDTH;
 		else
 			r++;
 		for (j = 0; j < 5; j++) {
 			if (disk_horiz)
 				mvprintw(r+j, c, "%*s", DISKCOLWIDTH, "");
 			else
 				mvprintw(r, c+j*DISKCOLWIDTH, "%*s", DISKCOLWIDTH, "");
+		}
+	}
 	last_disks = l;
 	/* Interrupts */
 	failcnt = 0;
 	inttotal = 0;
 	for (i = 0; i < nintr; i++) {
 		if (s.intrcnt[i] == 0)
 			continue;
 		if (intrloc[i] == 0) {
 			if (nextintsrow == LINES)
 				continue;
 			intrloc[i] = nextintsrow++;
 			mvprintw(intrloc[i], INTSCOL + 9, "%-.*s",
 				INTSCOLEND - (INTSCOL + 9), intrname[i]);
+		}
 		X(s, s1, intrcnt);
 		l = (int)((float)s.intrcnt[i]/etime + 0.5);
 		inttotal += l;
 		putint(l, intrloc[i], INTSCOL, 8);
+	}
 	for (i = 0; i < nevcnt; i++) {
 		if (s.evcnt[i] == 0)
 			continue;
 		if (ie_head[i].ie_loc == 0) {
 			if (nextintsrow == LINES)
 				continue;
 			ie_head[i].ie_loc = nextintsrow++;
 			print_ie_title(i);
+		}
 		X(s, s1, evcnt);
 		l = (int)((float)s.evcnt[i]/etime + 0.5);
 		inttotal += l;
 		putint(l, ie_head[i].ie_loc, INTSCOL, 8);
+	}
 	putint(inttotal, INTSROW, INTSCOL, 8);
 	PUTRATE(s, s1, uvmexp.forks, VMSTATROW + 0, VMSTATCOL + 3, 6);
 	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;
+}
 void
 vmstat_run(char *args)
+{
 	copyinfo(&s1, &s2);
 	display_mode = RUN;
+}
 void
 vmstat_time(char *args)
+{
 	display_mode = TIME;
+}
 void
 vmstat_zero(char *args)
+{
 	if (display_mode == RUN)
 		getinfo(&s1);
+}
 /* calculate number of users on the system */
 static int
 ucount(void)
+{
 	static int onusers = -1;
 	int nusers = 0;
 	struct utmpentry *ehead;
 	nusers = getutentries(NULL, &ehead);
 	if (nusers != onusers) {
 		if (nusers == 1)
 			mvprintw(STATROW, STATCOL + 8, " ");
 		else
 			mvprintw(STATROW, STATCOL + 8, "s");
+	}
 	onusers = nusers;
 	return (nusers);
+}
 static float
 cputime(int indx)
+{
 	double t;
 	int i;
 	t = 0;
 	for (i = 0; i < CPUSTATES; i++)
 		t += cur.cp_time[i];
 	if (t == 0.0)
 		t = 1.0;
 	return (cur.cp_time[indx] * 100.0 / t);
+}
 void
 puthumanint(u_int64_t n, int l, int c, int w)
+{
 	char b[128];
 	if (move(l, c) != OK)
 		return;
 	if (n == 0) {
 		hline(' ', w);
 		return;
+	}
 	if (humanize_number(b, w, n, "", HN_AUTOSCALE, HN_NOSPACE) == -1 ) {
 		hline('*', w);
 		return;
+	}
 	printw("%*s", w, b);
+}
 void
 putint(int n, int l, int c, int w)
+{
 	char b[128];
 	if (move(l, c) != OK)
 		return;
 	if (n == 0) {
 		hline(' ', w);
 		return;
+	}
 	(void)snprintf(b, sizeof b, "%*d", w, n);
 	if ((int)strlen(b) > w) {
 		if (display_mode == TIME)
 			hline('*', w);
 		else
 			puthumanint(n, l, c, w);
 		return;
+	}
 	addstr(b);
+}
 void
 putfloat(double f, int l, int c, int w, int d, int nz)
+{
 	char b[128];
 	if (move(l, c) != OK)
 		return;
 	if (nz && f == 0.0) {
 		hline(' ', w);
 		return;
+	}
 	(void)snprintf(b, sizeof b, "%*.*f", w, d, f);
 	if ((int)strlen(b) > w) {
 		hline('*', w);
 		return;
+	}
 	addstr(b);
+}
 static void
 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;
 	if (sysctl(mib, 2, &stats->Total, &size, NULL, 0) < 0) {
 		error("Can't get kernel info: %s\n", strerror(errno));
 		memset(&stats->Total, 0, sizeof(stats->Total));
+	}
+}
 static void
 allocinfo(struct Info *stats)
+{
 	if (nintr &&
 	    (stats->intrcnt = calloc(nintr, sizeof(long))) == NULL) {
 		error("calloc failed");
 		die(0);
+	}
 	if ((stats->evcnt = calloc(nevcnt, sizeof(u_int64_t))) == NULL) {
 		error("calloc failed");
 		die(0);
+	}
+}
 static void
 copyinfo(struct Info *from, struct Info *to)
+{
 	long *intrcnt;
 	u_int64_t *evcnt;
 	intrcnt = to->intrcnt;
 	evcnt = to->evcnt;
 	*to = *from;
 	memmove(to->intrcnt = intrcnt, from->intrcnt, nintr * sizeof *intrcnt);
 	memmove(to->evcnt = evcnt, from->evcnt, nevcnt * sizeof *evcnt);
+}
 static void
 dinfo(int dn, int r, int c)
+{
 	double atime, dtime;
 #define ADV if (disk_horiz) r++; else c += DISKCOLWIDTH
 	/* elapsed time for disk stats */
 	dtime = etime;
 	if (cur.timestamp[dn].tv_sec || cur.timestamp[dn].tv_usec) {
 		dtime = (double)cur.timestamp[dn].tv_sec +
 			((double)cur.timestamp[dn].tv_usec / (double)1000000);
+	}
 	mvprintw(r, c, "%*.*s", DISKCOLWIDTH, DISKCOLWIDTH, dr_name[dn]);
 	ADV;
 	putint((int)(cur.seek[dn]/dtime+0.5), r, c, DISKCOLWIDTH);
 	ADV;
 	putint((int)((cur.rxfer[dn]+cur.wxfer[dn])/dtime+0.5),
 	    r, c, DISKCOLWIDTH);
 	ADV;
 	puthumanint((cur.rbytes[dn] + cur.wbytes[dn]) / dtime + 0.5,
 		    r, c, DISKCOLWIDTH);
 	ADV;
 	/* time busy in disk activity */
 	atime = cur.time[dn].tv_sec + cur.time[dn].tv_usec / 1000000.0;
 	atime = atime * 100.0 / dtime;
 	if (atime >= 100)
 		putint(100, r, c, DISKCOLWIDTH);
 	else
 		putfloat(atime, r, c, DISKCOLWIDTH, 1, 1);
+}