diff options
author | dg <dg@FreeBSD.org> | 1995-03-25 08:44:48 +0000 |
---|---|---|
committer | dg <dg@FreeBSD.org> | 1995-03-25 08:44:48 +0000 |
commit | c510e7263f286f3b01b7aea0087215c35c943f23 (patch) | |
tree | 1e79f813a256739e776bbf63edd7782bb3912720 | |
parent | 0785cceb5c3227dd6fb02c881471774168feaba6 (diff) | |
download | FreeBSD-src-c510e7263f286f3b01b7aea0087215c35c943f23.zip FreeBSD-src-c510e7263f286f3b01b7aea0087215c35c943f23.tar.gz |
Removed object lookup/hit count and changed the order of things a little.
-rw-r--r-- | usr.bin/systat/vmstat.c | 52 | ||||
-rw-r--r-- | usr.bin/vmstat/vmstat.c | 6 |
2 files changed, 26 insertions, 32 deletions
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c index b2d5148..9f1ce1b 100644 --- a/usr.bin/systat/vmstat.c +++ b/usr.bin/systat/vmstat.c @@ -294,20 +294,18 @@ labelkre() mvprintw(VMSTATROW + 0, VMSTATCOL + 10, "cow"); mvprintw(VMSTATROW + 1, VMSTATCOL + 10, "zfod"); - mvprintw(VMSTATROW + 2, VMSTATCOL + 10, "objlk"); - mvprintw(VMSTATROW + 3, VMSTATCOL + 10, "objht"); - mvprintw(VMSTATROW + 4, VMSTATCOL + 10, "cache"); - mvprintw(VMSTATROW + 5, VMSTATCOL + 10, "wire"); - mvprintw(VMSTATROW + 6, VMSTATCOL + 10, "act"); - mvprintw(VMSTATROW + 7, VMSTATCOL + 10, "inact"); - mvprintw(VMSTATROW + 8, VMSTATCOL + 10, "free"); - mvprintw(VMSTATROW + 9, VMSTATCOL + 10, "daefr"); - mvprintw(VMSTATROW + 10, VMSTATCOL + 10, "prcfr"); - mvprintw(VMSTATROW + 11, VMSTATCOL + 10, "react"); - mvprintw(VMSTATROW + 12, VMSTATCOL + 10, "pdwake"); - mvprintw(VMSTATROW + 13, VMSTATCOL + 10, "pdpgs"); - mvprintw(VMSTATROW + 14, VMSTATCOL + 10, "intrn"); - mvprintw(VMSTATROW + 15, VMSTATCOL + 10, "buf"); + mvprintw(VMSTATROW + 2, VMSTATCOL + 10, "wire"); + mvprintw(VMSTATROW + 3, VMSTATCOL + 10, "act"); + mvprintw(VMSTATROW + 4, VMSTATCOL + 10, "inact"); + mvprintw(VMSTATROW + 5, VMSTATCOL + 10, "cache"); + mvprintw(VMSTATROW + 6, VMSTATCOL + 10, "free"); + mvprintw(VMSTATROW + 7, VMSTATCOL + 10, "daefr"); + mvprintw(VMSTATROW + 8, VMSTATCOL + 10, "prcfr"); + mvprintw(VMSTATROW + 9, VMSTATCOL + 10, "react"); + mvprintw(VMSTATROW + 10, VMSTATCOL + 10, "pdwake"); + mvprintw(VMSTATROW + 11, VMSTATCOL + 10, "pdpgs"); + mvprintw(VMSTATROW + 12, VMSTATCOL + 10, "intrn"); + mvprintw(VMSTATROW + 13, VMSTATCOL + 10, "buf"); mvprintw(GENSTATROW, GENSTATCOL, " Csw Trp Sys Int Sof Flt"); @@ -445,20 +443,18 @@ showkre() putint(total.t_sw, PROCSROW + 1, PROCSCOL + 15, 3); PUTRATE(Cnt.v_cow_faults, VMSTATROW + 0, VMSTATCOL + 3, 6); PUTRATE(Cnt.v_zfod, VMSTATROW + 1, VMSTATCOL + 4, 5); - PUTRATE(Cnt.v_lookups, VMSTATROW + 2, VMSTATCOL + 3, 6); - PUTRATE(Cnt.v_hits, VMSTATROW + 3, VMSTATCOL + 3, 6); - putint(pgtokb(cnt.v_cache_count), VMSTATROW + 4, VMSTATCOL, 9); - putint(pgtokb(cnt.v_wire_count), VMSTATROW + 5, VMSTATCOL, 9); - putint(pgtokb(cnt.v_active_count), VMSTATROW + 6, VMSTATCOL, 9); - putint(pgtokb(cnt.v_inactive_count), VMSTATROW + 7, VMSTATCOL, 9); - putint(pgtokb(cnt.v_free_count), VMSTATROW + 8, VMSTATCOL, 9); - PUTRATE(Cnt.v_dfree, VMSTATROW + 9, VMSTATCOL, 9); - PUTRATE(Cnt.v_pfree, VMSTATROW + 10, VMSTATCOL, 9); - PUTRATE(Cnt.v_reactivated, VMSTATROW + 11, VMSTATCOL, 9); - PUTRATE(Cnt.v_pdwakeups, VMSTATROW + 12, VMSTATCOL, 9); - PUTRATE(Cnt.v_pdpages, VMSTATROW + 13, VMSTATCOL, 9); - PUTRATE(Cnt.v_intrans, VMSTATROW + 14, VMSTATCOL, 9); - putint(s.bufspace/1024, VMSTATROW + 15, VMSTATCOL, 9); + putint(pgtokb(cnt.v_wire_count), VMSTATROW + 2, VMSTATCOL, 9); + putint(pgtokb(cnt.v_active_count), VMSTATROW + 3, VMSTATCOL, 9); + putint(pgtokb(cnt.v_inactive_count), VMSTATROW + 4, VMSTATCOL, 9); + putint(pgtokb(cnt.v_cache_count), VMSTATROW + 5, VMSTATCOL, 9); + putint(pgtokb(cnt.v_free_count), VMSTATROW + 6, VMSTATCOL, 9); + PUTRATE(Cnt.v_dfree, VMSTATROW + 7, VMSTATCOL, 9); + PUTRATE(Cnt.v_pfree, VMSTATROW + 8, VMSTATCOL, 9); + PUTRATE(Cnt.v_reactivated, VMSTATROW + 9, VMSTATCOL, 9); + PUTRATE(Cnt.v_pdwakeups, VMSTATROW + 10, VMSTATCOL, 9); + PUTRATE(Cnt.v_pdpages, VMSTATROW + 11, VMSTATCOL, 9); + PUTRATE(Cnt.v_intrans, VMSTATROW + 12, VMSTATCOL, 9); + putint(s.bufspace/1024, VMSTATROW + 13, VMSTATCOL, 9); PUTRATE(Cnt.v_vnodein, PAGEROW + 2, PAGECOL + 5, 5); PUTRATE(Cnt.v_vnodeout, PAGEROW + 2, PAGECOL + 10, 5); PUTRATE(Cnt.v_swapin, PAGEROW + 2, PAGECOL + 17, 5); diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 96eb45c..c6b8f71 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -550,14 +550,12 @@ dosum() (void)printf("%9u vnode pager pages paged in\n", sum.v_vnodepgsin); (void)printf("%9u vnode pager pageouts\n", sum.v_vnodeout); (void)printf("%9u vnode pager pages paged out\n", sum.v_vnodepgsout); - (void)printf("%9u VM object cache lookups\n", sum.v_lookups); - (void)printf("%9u VM object hits\n", sum.v_hits); (void)printf("%9u page daemon wakeups\n", sum.v_pdwakeups); (void)printf("%9u pages examined by the page daemon\n", sum.v_pdpages); (void)printf("%9u pages reactivated\n", sum.v_reactivated); - (void)printf("%9u intransit blocking page faults\n", sum.v_intrans); - (void)printf("%9u zero fill pages zeroed\n", sum.v_zfod); (void)printf("%9u copy-on-write faults\n", sum.v_cow_faults); + (void)printf("%9u zero fill pages zeroed\n", sum.v_zfod); + (void)printf("%9u intransit blocking page faults\n", sum.v_intrans); (void)printf("%9u total VM faults taken\n", sum.v_vm_faults); (void)printf("%9u pages freed\n", sum.v_tfree); (void)printf("%9u pages freed by daemon\n", sum.v_dfree); |