Module Name: src
Committed By: njoly
Date: Fri Apr 30 13:49:22 UTC 2010
Modified Files:
src/usr.bin/systat: vmstat.c
Log Message:
In vmstat display, add one more column to output memory values. Avoid
overflow with more than 100GB.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/usr.bin/systat/vmstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/systat/vmstat.c
diff -u src/usr.bin/systat/vmstat.c:1.75 src/usr.bin/systat/vmstat.c:1.76
--- src/usr.bin/systat/vmstat.c:1.75 Wed Oct 21 21:12:07 2009
+++ src/usr.bin/systat/vmstat.c Fri Apr 30 13:49:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.75 2009/10/21 21:12:07 rmind Exp $ */
+/* $NetBSD: vmstat.c,v 1.76 2010/04/30 13:49:22 njoly Exp $ */
/*-
* Copyright (c) 1983, 1989, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
#endif
-__RCSID("$NetBSD: vmstat.c,v 1.75 2009/10/21 21:12:07 rmind Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.76 2010/04/30 13:49:22 njoly Exp $");
#endif /* not lint */
/*
@@ -350,8 +350,8 @@
/* Left hand column */
- mvprintw(MEMROW, MEMCOL, " memory totals (in kB)");
- mvprintw(MEMROW + 1, MEMCOL, " real virtual free");
+ mvprintw(MEMROW, MEMCOL, " memory totals (in kB)");
+ mvprintw(MEMROW + 1, MEMCOL, " real virtual free");
mvprintw(MEMROW + 2, MEMCOL, "Active");
mvprintw(MEMROW + 3, MEMCOL, "All");
@@ -514,15 +514,16 @@
/* Memory totals */
#define pgtokb(pg) ((pg) * (s.uvmexp.pagesize / 1024))
- putint(pgtokb(s.uvmexp.active), MEMROW + 2, MEMCOL + 6, 8);
+ putint(pgtokb(s.uvmexp.active), MEMROW + 2, MEMCOL + 6, 9);
putint(pgtokb(s.uvmexp.active + s.uvmexp.swpginuse), /* XXX */
- MEMROW + 2, MEMCOL + 15, 8);
- putint(pgtokb(s.uvmexp.npages - s.uvmexp.free), MEMROW + 3, MEMCOL + 6, 8);
+ MEMROW + 2, MEMCOL + 16, 9);
+ putint(pgtokb(s.uvmexp.npages - s.uvmexp.free),
+ MEMROW + 3, MEMCOL + 6, 9);
putint(pgtokb(s.uvmexp.npages - s.uvmexp.free + s.uvmexp.swpginuse),
- MEMROW + 3, MEMCOL + 15, 8);
- putint(pgtokb(s.uvmexp.free), MEMROW + 2, MEMCOL + 24, 8);
+ MEMROW + 3, MEMCOL + 16, 9);
+ putint(pgtokb(s.uvmexp.free), MEMROW + 2, MEMCOL + 26, 9);
putint(pgtokb(s.uvmexp.free + s.uvmexp.swpages - s.uvmexp.swpginuse),
- MEMROW + 3, MEMCOL + 24, 8);
+ MEMROW + 3, MEMCOL + 26, 9);
#undef pgtokb
/* Namei cache */
