diff options
| author |   beck <beck@openbsd.org> | 2011-07-06 00:11:57 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2011-07-06 00:11:57 +0000 |
| commit | bda7aa5fbf04586d87e715668beaca145e36a7fe (patch) | |
| tree | 8ce6c67476d163f1b32bd1938bba814debee6ef1 | |
| parent | Finalize work on the math library. It's time to do this monster (diff) | |
| download | wireguard-openbsd-bda7aa5fbf04586d87e715668beaca145e36a7fe.tar.xz wireguard-openbsd-bda7aa5fbf04586d87e715668beaca145e36a7fe.zip | |
add a couple of fields needed for buffer flipping, and change systat to
show useful info in systat io instead of goo
| -rw-r--r-- | sys/sys/mount.h | 4 | ||||
| -rw-r--r-- | usr.bin/systat/iostat.c | 40 |
2 files changed, 11 insertions, 33 deletions
diff --git a/sys/sys/mount.h b/sys/sys/mount.h index bd05ec88c72..aa0284fe4ef 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.h,v 1.103 2011/04/05 18:51:26 thib Exp $ */ +/* $OpenBSD: mount.h,v 1.104 2011/07/06 00:11:57 beck Exp $ */ /* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */ /* @@ -494,6 +494,8 @@ struct bcachestats { int64_t numreads; /* total reads started */ int64_t cachehits; /* total reads found in cache */ int64_t busymapped; /* number of busy and mapped buffers */ + int64_t dmapages; /* dma reachable pages in buffer cache */ + int64_t highpages; /* pages above dma region */ }; #ifdef _KERNEL extern struct bcachestats bcstats; diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c index a917f33858d..6157d16397a 100644 --- a/usr.bin/systat/iostat.c +++ b/usr.bin/systat/iostat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iostat.c,v 1.38 2011/03/02 06:48:17 jasper Exp $ */ +/* $OpenBSD: iostat.c,v 1.39 2011/07/06 00:11:57 beck Exp $ */ /* $NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $ */ /* @@ -218,51 +218,27 @@ showdrive(int dn) void showbcache(void) { - print_fld_str(FLD_IO_SSTR, "numbufs"); - print_fld_ssize(FLD_IO_SVAL, bccur.numbufs); - end_line(); - - print_fld_str(FLD_IO_SSTR, "freebufs"); - print_fld_ssize(FLD_IO_SVAL, bccur.freebufs); - end_line(); - - print_fld_str(FLD_IO_SSTR, "numbufpages"); + print_fld_str(FLD_IO_SSTR, "total pages"); print_fld_ssize(FLD_IO_SVAL, bccur.numbufpages); end_line(); - print_fld_str(FLD_IO_SSTR, "numfreepages"); - print_fld_ssize(FLD_IO_SVAL, bccur.numfreepages); + print_fld_str(FLD_IO_SSTR, "dma pages"); + print_fld_ssize(FLD_IO_SVAL, bccur.dmapages); end_line(); - print_fld_str(FLD_IO_SSTR, "numdirtypages"); + print_fld_str(FLD_IO_SSTR, "dirty pages"); print_fld_ssize(FLD_IO_SVAL, bccur.numdirtypages); end_line(); - print_fld_str(FLD_IO_SSTR, "numcleanpages"); - print_fld_ssize(FLD_IO_SVAL, bccur.numcleanpages); - end_line(); - - print_fld_str(FLD_IO_SSTR, "pendingwrites"); + print_fld_str(FLD_IO_SSTR, "pending writes"); print_fld_ssize(FLD_IO_SVAL, bccur.pendingwrites); end_line(); - print_fld_str(FLD_IO_SSTR, "pendingreads"); + print_fld_str(FLD_IO_SSTR, "pending reads"); print_fld_ssize(FLD_IO_SVAL, bccur.pendingreads); end_line(); - print_fld_str(FLD_IO_SSTR, "numwrites"); - print_fld_ssize(FLD_IO_SVAL, bccur.numwrites - bclast.numwrites); - end_line(); - - print_fld_str(FLD_IO_SSTR, "numreads"); - print_fld_ssize(FLD_IO_SVAL, bccur.numreads - bclast.numreads); - end_line(); - - print_fld_str(FLD_IO_SSTR, "cachehits"); + print_fld_str(FLD_IO_SSTR, "cache hits"); print_fld_ssize(FLD_IO_SVAL, bccur.cachehits - bclast.cachehits); end_line(); - - print_fld_str(FLD_IO_SSTR, "busymapped"); - print_fld_ssize(FLD_IO_SVAL, bccur.busymapped); - end_line(); } |