Shuffle fields around to eliminate blanks spots resulting from

removing unused uvmexp fields. Reduces number of lines as well.

1 files changed, 40 insertions, 58 deletions

diff --git a/usr.bin/systat/uvm.c b/usr.bin/systat/uvm.c
index d054f7bef57..108be63ae8d 100644
--- a/usr.bin/systat/uvm.c
+++ b/usr.bin/systat/uvm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm.c,v 1.3 2018/06/19 22:35:07 krw Exp $	*/
+/*	$OpenBSD: uvm.c,v 1.4 2018/06/21 13:47:22 krw Exp $	*/
 /*
  * Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org>
  * Copyright (c) 2018 Kenneth R Westerback <krw@openbsd.org>
@@ -82,90 +82,72 @@ struct uvmline uvmline[] = {
 	  &uvmexp.fltrelckok, &last_uvmexp.fltrelckok, "fltrelckok" },
 	{ &uvmexp.reserve_pagedaemon, &last_uvmexp.reserve_pagedaemon,
 	  "reserve_pagedaemon",
-	  NULL, NULL, NULL,
+	  &uvmexp.pgswapin, &last_uvmexp.pgswapin, "pgswapin",
 	  &uvmexp.fltanget, &last_uvmexp.fltanget, "fltanget" },
 	{ &uvmexp.reserve_kernel, &last_uvmexp.reserve_kernel, "reserve_kernel",
-	  NULL, NULL, NULL,
+	  &uvmexp.pgswapout, &last_uvmexp.pgswapout, "pgswapout",
 	  &uvmexp.fltanretry, &last_uvmexp.fltanretry, "fltanretry" },
 	{ NULL, NULL, NULL,
-	  &uvmexp.pgswapin, &last_uvmexp.pgswapin, "pgswapin",
-	  &uvmexp.fltamcopy, &last_uvmexp.fltamcopy, "fltamcopy" },
-	{ NULL, NULL, NULL,
-	  &uvmexp.pgswapout, &last_uvmexp.pgswapout, "pgswapout",
-	  &uvmexp.fltnamap, &last_uvmexp.fltnamap, "fltnamap" },
-	{ NULL, NULL, NULL, 
 	  &uvmexp.forks, &last_uvmexp.forks, "forks",
-	  &uvmexp.fltnomap, &last_uvmexp.fltnomap, "fltnomap" },
-	{ NULL, NULL, NULL,
-	  &uvmexp.forks_ppwait, &last_uvmexp.forks_ppwait, "forks_ppwait",
-	  &uvmexp.fltlget, &last_uvmexp.fltlget, "fltlget" },
+	  &uvmexp.fltamcopy, &last_uvmexp.fltamcopy, "fltamcopy" },
 	{ NULL, NULL, "Pageout Params",
-	  &uvmexp.forks_sharevm, &last_uvmexp.forks_sharevm, "forks_sharevm",
-	  &uvmexp.fltget, &last_uvmexp.fltget, "fltget" },
+	  &uvmexp.forks_ppwait, &last_uvmexp.forks_ppwait, "forks_ppwait",
+	  &uvmexp.fltnamap, &last_uvmexp.fltnamap, "fltnamap" },
 	{ &uvmexp.freemin, &last_uvmexp.freemin, "freemin",
-	  &uvmexp.pga_zerohit, &last_uvmexp.pga_zerohit, "pga_zerohit",
-	  &uvmexp.flt_anon, &last_uvmexp.flt_anon, "flt_anon" },
+	  &uvmexp.forks_sharevm, &last_uvmexp.forks_sharevm, "forks_sharevm",
+	  &uvmexp.fltnomap, &last_uvmexp.fltnomap, "fltnomap" },
 	{ &uvmexp.freetarg, &last_uvmexp.freetarg, "freetarg",
-	  &uvmexp.pga_zeromiss, &last_uvmexp.pga_zeromiss, "pga_zeromiss",
-	  &uvmexp.flt_acow, &last_uvmexp.flt_acow, "flt_acow" },
+	  &uvmexp.pga_zerohit, &last_uvmexp.pga_zerohit, "pga_zerohit",
+	  &uvmexp.fltlget, &last_uvmexp.fltlget, "fltlget" },
 	{ &uvmexp.inactarg, &last_uvmexp.inactarg, "inactarg",
-	  NULL, NULL, NULL,
-	  &uvmexp.flt_obj, &last_uvmexp.flt_obj, "flt_obj" },
+	  &uvmexp.pga_zeromiss, &last_uvmexp.pga_zeromiss, "pga_zeromiss",
+	  &uvmexp.fltget, &last_uvmexp.fltget, "fltget" },
 	{ &uvmexp.wiredmax, &last_uvmexp.wiredmax, "wiredmax",
 	  NULL, NULL, NULL,
-	  &uvmexp.flt_prcopy, &last_uvmexp.flt_prcopy, "flt_prcopy" },
+	  &uvmexp.flt_anon, &last_uvmexp.flt_anon, "flt_anon" },
 	{ &uvmexp.anonmin, &last_uvmexp.anonmin, "anonmin",
-	  NULL, NULL, "Swap Counters",
-	  &uvmexp.flt_przero, &last_uvmexp.flt_przero, "flt_przero" },
+	  NULL, NULL, "Daemon Counters",
+	  &uvmexp.flt_acow, &last_uvmexp.flt_acow, "flt_acow" },
 	{ &uvmexp.vtextmin, &last_uvmexp.vtextmin, "vtextmin",
-	  &uvmexp.nswapdev, &last_uvmexp.nswapdev, "nswapdev",
-	  NULL, NULL, NULL },
+	  &uvmexp.pdwoke, &last_uvmexp.pdwoke, "pdwoke",
+	  &uvmexp.flt_obj, &last_uvmexp.flt_obj, "flt_obj" },
 	{ &uvmexp.vnodemin, &last_uvmexp.vnodemin, "vnodemin",
-	  &uvmexp.swpages, &last_uvmexp.swpages, "swpages",
-	  NULL, NULL, "Daemon Counters" },
+	  &uvmexp.pdrevs, &last_uvmexp.pdrevs, "pdrevs",
+	  &uvmexp.flt_prcopy, &last_uvmexp.flt_prcopy, "flt_prcopy" },
 	{ &uvmexp.anonminpct, &last_uvmexp.anonminpct, "anonminpct",
-	  &uvmexp.swpginuse, &last_uvmexp.swpginuse, "swpginuse",
-	  &uvmexp.pdwoke, &last_uvmexp.pdwoke, "pdwoke" },
+	  &uvmexp.pdswout, &last_uvmexp.pdswout, "pdswout",
+	  &uvmexp.flt_przero, &last_uvmexp.flt_przero, "flt_przero" },
 	{ &uvmexp.vtextminpct, &last_uvmexp.vtextminpct, "vtextminpct",
 	  &uvmexp.swpgonly, &last_uvmexp.swpgonly, "swpgonly",
-	  &uvmexp.pdrevs, &last_uvmexp.pdrevs, "pdrevs" },
+	  NULL, NULL, NULL },
 	{ &uvmexp.vnodeminpct, &last_uvmexp.vnodeminpct, "vnodeminpct",
-	  &uvmexp.nswget, &last_uvmexp.nswget, "nswget",
-	  &uvmexp.pdswout, &last_uvmexp.pdswout, "pdswout" },
+	  &uvmexp.pdfreed, &last_uvmexp.pdfreed, "pdfreed",
+	  NULL, NULL, "Swap Counters" },
 	{ NULL, NULL, NULL,
-	  NULL, NULL, NULL,
-	  &uvmexp.pdfreed, &last_uvmexp.pdfreed, "pdfreed" },
+	  &uvmexp.pdscans, &last_uvmexp.pdscans, "pdscans",
+	  &uvmexp.nswapdev, &last_uvmexp.nswapdev, "nswapdev" },
 	{ NULL, NULL, "Misc Counters",
-	  NULL, NULL, NULL,
-	  &uvmexp.pdscans, &last_uvmexp.pdscans, "pdscans" },
+	  &uvmexp.pdanscan, &last_uvmexp.pdanscan, "pdanscan",
+	  &uvmexp.swpages, &last_uvmexp.swpages, "swpages" },
 	{ &uvmexp.fpswtch, &last_uvmexp.fpswtch, "fpswtch",
-	  NULL, NULL, NULL,
-	  &uvmexp.pdanscan, &last_uvmexp.pdanscan, "pdanscan" },
+	  &uvmexp.pdobscan, &last_uvmexp.pdobscan, "pdobscan",
+	  &uvmexp.swpginuse, &last_uvmexp.swpginuse, "swpginuse" },
 	{ &uvmexp.kmapent, &last_uvmexp.kmapent, "kmapent",
-	  NULL, NULL, NULL,
-	  &uvmexp.pdobscan, &last_uvmexp.pdobscan, "pdobscan" },
+	  &uvmexp.pdreact, &last_uvmexp.pdreact, "pdreact",
+	  &uvmexp.nswget, &last_uvmexp.nswget, "nswget" },
 	{ NULL, NULL, NULL,
-	  NULL, NULL, NULL,
-	  &uvmexp.pdreact, &last_uvmexp.pdreact, "pdreact" },
+	  &uvmexp.pdbusy, &last_uvmexp.pdbusy, "pdbusy",
+	  NULL, NULL, NULL },
 	{ NULL, NULL, "Constants",
-	  NULL, NULL, NULL,
-	  &uvmexp.pdbusy, &last_uvmexp.pdbusy, "pdbusy" },
+	  &uvmexp.pdpageouts, &last_uvmexp.pdpageouts, "pdpageouts",
+	  NULL, NULL, NULL },
 	{ &uvmexp.pagesize, &last_uvmexp.pagesize, "pagesize",
-	  NULL, NULL, NULL,
-	  &uvmexp.pdpageouts, &last_uvmexp.pdpageouts, "pdpageouts" },
-	{ &uvmexp.pagemask, &last_uvmexp.pagemask, "pagemask",
-	  NULL, NULL, NULL,
-	  &uvmexp.pdpending, &last_uvmexp.pdpending, "pdpending" },
-	{ &uvmexp.pageshift, &last_uvmexp.pageshift, "pageshift",
-	  NULL, NULL, NULL,
-	  &uvmexp.pddeact, &last_uvmexp.pddeact, "pddeact" },
-	{ NULL, NULL, NULL,
-	  NULL, NULL, NULL,
+	  &uvmexp.pdpending, &last_uvmexp.pdpending, "pdpending",
 	  NULL, NULL, NULL },
-	{ NULL, NULL, NULL,
-	  NULL, NULL, NULL,
+	{ &uvmexp.pagemask, &last_uvmexp.pagemask, "pagemask",
+	  &uvmexp.pddeact, &last_uvmexp.pddeact, "pddeact",
 	  NULL, NULL, NULL },
-	{ NULL, NULL, NULL,
+	{ &uvmexp.pageshift, &last_uvmexp.pageshift, "pageshift",
 	  NULL, NULL, NULL,
 	  NULL, NULL, NULL }
 };