diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-05-14 20:39:26 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-05-14 20:39:26 +0000 |
| commit | b1f45288e5713445699ce3b4cd8b254197a424cb (patch) | |
| tree | cfad35f4fb1491f1d513f7fda7f05e8a0fee6153 | |
| parent | 41231f125eede45040bf595106eeab6040374068 (diff) | |
Don't display swapin/swapout uvmexp fields
| -rw-r--r-- | libexec/rpc.rstatd/rstat_proc.c | 6 | ||||
| -rw-r--r-- | usr.bin/systat/vmstat.c | 4 | ||||
| -rw-r--r-- | usr.bin/vmstat/vmstat.c | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index d9a5bc867e3..4763941410e 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rstat_proc.c,v 1.28 2010/09/01 14:43:34 millert Exp $ */ +* $OpenBSD: rstat_proc.c,v 1.29 2013/05/14 20:39:24 miod Exp $ */ /* * Copyright (c) 2010, Oracle America, Inc. @@ -232,8 +232,8 @@ updatestat(void) } stats_all.s1.v_pgpgin = uvmexp.fltanget; stats_all.s1.v_pgpgout = uvmexp.pdpageouts; - stats_all.s1.v_pswpin = uvmexp.swapins; - stats_all.s1.v_pswpout = uvmexp.swapouts; + stats_all.s1.v_pswpin = 0; + stats_all.s1.v_pswpout = 0; stats_all.s1.v_intr = uvmexp.intrs; stats_all.s2.v_swtch = uvmexp.swtch; gettimeofday(&tm, (struct timezone *) 0); diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c index a7025edab5c..13c13c7b809 100644 --- a/usr.bin/systat/vmstat.c +++ b/usr.bin/systat/vmstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmstat.c,v 1.73 2010/11/19 18:35:16 mikeb Exp $ */ +/* $OpenBSD: vmstat.c,v 1.74 2013/05/14 20:39:25 miod Exp $ */ /* $NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $ */ /*- @@ -417,8 +417,6 @@ showkre(void) PUTRATE(uvmexp.pageins, PAGEROW + 2, PAGECOL + 5, 5); PUTRATE(uvmexp.pdpageouts, PAGEROW + 2, PAGECOL + 10, 5); - PUTRATE(uvmexp.swapins, PAGEROW + 2, PAGECOL + 15, 5); - PUTRATE(uvmexp.swapouts, PAGEROW + 2, PAGECOL + 20, 5); PUTRATE(uvmexp.pgswapin, PAGEROW + 3, PAGECOL + 5, 5); PUTRATE(uvmexp.pgswapout, PAGEROW + 3, PAGECOL + 10, 5); diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 31a6b299033..cffa59112a8 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1,5 +1,5 @@ /* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */ -/* $OpenBSD: vmstat.c,v 1.120 2013/03/26 21:13:55 tedu Exp $ */ +/* $OpenBSD: vmstat.c,v 1.121 2013/05/14 20:39:25 miod Exp $ */ /* * Copyright (c) 1980, 1986, 1991, 1993 @@ -539,8 +539,6 @@ dosum(void) (void)printf("%11u software interrupts\n", uvmexp.softs); (void)printf("%11u syscalls\n", uvmexp.syscalls); (void)printf("%11u pagein operations\n", uvmexp.pageins); - (void)printf("%11u swap ins\n", uvmexp.swapins); - (void)printf("%11u swap outs\n", uvmexp.swapouts); (void)printf("%11u forks\n", uvmexp.forks); (void)printf("%11u forks where vmspace is shared\n", uvmexp.forks_sharevm); |