CVS log for src/usr.bin/systat/vmstat.c

Up to [cvs.NetBSD.org] / src / usr.bin / systat

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Pull up following revision(s) (requested by kre in ticket #1926):

	usr.bin/systat/vmstat.c: revision 1.92

PR bin/56014 from Kouichi Hashikawa

Don't try to optimise away placing the "s" or " " after "N user"
(" " where N==1, "s" otherwise) when it seems unnecessary, as that
fails when the number of users hasn't changed, but the screen is
being redrawn from nothing (as in after being resumed from a ^Z,
as in the PR, but just doing a ^L would make the same thing happen).

Pull up following revision(s) (requested by kre in ticket #1777):

	usr.bin/systat/vmstat.c: revision 1.92

PR bin/56014 from Kouichi Hashikawa

Don't try to optimise away placing the "s" or " " after "N user"
(" " where N==1, "s" otherwise) when it seems unnecessary, as that
fails when the number of users hasn't changed, but the screen is
being redrawn from nothing (as in after being resumed from a ^Z,
as in the PR, but just doing a ^L would make the same thing happen).

Pull up following revision(s) (requested by kre in ticket #489):

	usr.bin/systat/vmstat.c: revision 1.92

PR bin/56014 from Kouichi Hashikawa

Don't try to optimise away placing the "s" or " " after "N user"
(" " where N==1, "s" otherwise) when it seems unnecessary, as that
fails when the number of users hasn't changed, but the screen is
being redrawn from nothing (as in after being resumed from a ^Z,
as in the PR, but just doing a ^L would make the same thing happen).

PR bin/56014 from Kouichi Hashikawa

Don't try to optimise away placing the "s" or " " after "N user"
(" " where N==1, "s" otherwise) when it seems unnecessary, as that
fails when the number of users hasn't changed, but the screen is
being redrawn from nothing (as in after being resumed from a ^Z,
as in the PR, but just doing a ^L would make the same thing happen).

XXX pullup -10 (maybe -9 as well - seems too trivial for -8).

systat(1): convert realloc(x * y) to reallocarr, eliminate a temp var

PR/56331: Paul Goyette: Add -z option to display 0 instead of ' ' in vmstat.

Instead of getting an estimate of the number of kernel buffers,
allocating memory for them, requesting all the metadata contents of
these buffers (and repeating in the unlikely case of the number of
buffers increasing too much since the estimate) and then straight away
throwing all the contents out just to count how many buffers there were,
just get the initial estimate from the kernel and subtract the slop.

Reduces system CPU usage of "systat vm" by approx 80% for any system
with a reasonable number of buffers.

Mostly merge changes from HEAD upto 20200411

Merge changes from current as of 20200406

increase slot slop space from 100 to 1000 before giving up.

from Paul Ripke on current-users.  thanks!

Make the scaling of the "bytes written" sticky, so that if we go
to K, we don't return to unscaled, and similar for higher scales
(though it takes some effort, due to the wide field...)
Fixes PR#54334.

Sync with HEAD

Pull up following revision(s) (requested by christos in ticket #1176):

	usr.bin/systat/main.c: revision 1.55
	usr.bin/systat/extern.h: revision 1.47
	usr.bin/systat/syscall.c: revision 1.10
	usr.bin/systat/iostat.c: revision 1.39
	usr.bin/systat/vmstat.c: revision 1.85
	usr.bin/systat/vmstat.c: revision 1.86

no need for curses.h

 -

PR/53906: Paul Ripke: systat(1) vmstat & syscall get
"alternate system clock has died" on terminal resize (SIGWINCH)

Sync with HEAD

no need for curses.h

PR/53906: Paul Ripke: systat(1) vmstat & syscall get
"alternate system clock has died" on terminal resize (SIGWINCH)

Synch with HEAD

Remove a format character from a non-format string.

Sync with HEAD, resolve a few conflicts

Extend "systat vm" output to provide better insight about buffercache and
document it.

From Greg A. Woods in PR bin/36542

Pull up following revision(s) (requested by mlelstv in ticket #138):
	usr.bin/systat/iostat.c: revision 1.38
	usr.bin/systat/vmstat.c: revision 1.82
	usr.bin/vmstat/drvstats.c: revision 1.11
	usr.bin/vmstat/drvstats.h: revision 1.5
	usr.bin/vmstat/vmstat.c: revision 1.217
	usr.sbin/iostat/iostat.c: revision 1.65
Use I/O timestamps to compute disk statistics for better precision.
Disk statistics are collected in a fixed size array, that got corrupted
when a disk was detached. Adapt by skipping entries of detached disks
and detect reused disknames at the array end.
--
Use I/O timestamps to compute disk statistics for better precisison.

3327190

file vmstat.c was added on branch perseant-stdc-iso10646 on 2017-07-15 08:22:24 +0000

Use I/O timestamps to compute disk statistics for better precisison.

Update stats-keeping in sys/kern/vfs_cache.c to remove (most)
races while allowing consistent lockless sampling of the per-cpu
statistics without atomic operations.  Update comment describing
the locking protocol to include this.

These files were fumble-fingered out of the last commit.

Rebase to HEAD as of a few days ago.

Rebase.

Remove fagile test which ensured that first namelist element (was
X_NCHSTATS) had a known type. Make disk stats available again for
vmstat display.

GC X_NCHSTATS

Provide sysctl for namecache statistics.

Add per process cache values to the total name translations count.

In vmstat display, add one more column to output memory values. Avoid
overflow with more than 100GB.

sync to netbsd-5

Pull up following revision(s) (requested by wiz in ticket #1110):
	usr.bin/systat/vmstat.c: revision 1.74
	usr.bin/systat/syscall.c: revision 1.7
Fix problems with SIGWINCH. From Paul Ripke in PR 42161.

Remove uarea swap-out functionality:

- Addresses the issue described in PR/38828.
- Some simplification in threading and sleepq subsystems.
- Eliminates pmap_collect() and, as a side note, allows pmap optimisations.
- Eliminates XS_CTL_DATA_ONSTACK in scsipi code.
- Avoids few scans on LWP list and thus potentially long holds of proc_lock.
- Cuts ~1.5k lines of code.  Reduces amd64 kernel size by ~4k.
- Removes __SWAP_BROKEN cases.

Tested on x86, mips, acorn32 (thanks <mpumford>) and partly tested on
acorn26 (thanks to <bjh21>).

Discussed on <tech-kern>, reviewed by <ad>.

Fix problems with SIGWINCH. From Paul Ripke in PR 42161.

Sync with HEAD.

Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html

Fix -Wsign-compare issues

In vmstat display, increase software interrupt count output from 5 to
6 columns.

Sync with wrstuden-revivesa-base-2.

Clarify how one is supposed to use the pointers returned by getutentries()
(the utmpentry.c code), specifically with respect to who owns them and
when to free them. Now they're owned by utmpentry.c, only. Abolish the
freeutentries() function, which was the wrong abstraction; add instead
endutentries(), which flushes out the internally managed memory.

Update callers as necessary. Some (e.g. talkd) had been leaking memory;
others (e.g. syslogd) had been accidentally freeing and reloading utmp
more often than necessary. There are a couple untidy bits in users and
rwhod that someone should look after sometime, maybe.

Fixes PR bin/35131, which was about talkd's memory leak.

sync with HEAD

#include <sys/evcnt.h> instead of <sys/device.h>, since the former
is sufficient, anyway.  Do not needlessly #include <sys/device.h>.

Note well: device_t is not part of the kernel ABI.

use c99 initializers
consistently terminate nlist arrays with NULL not ""

Sync with head.

Reduce the field widths for the summary line of traps, system calls
and interrupts so that the numbers don't all run into one.

Gcc 4 needs to have the enum declaration in scope to determine the enum size.

include errno.h directly rather than via user.h.

Update to use new kernel io statistics.

free() intrnamebuf, intrname and intrloc on entry so we don't leak them
every time initvmstat() is called.
Change intrnamebuf to be static so this works.
Inspired by Coverty CID 2072 (incorrectly) reporting that the memory assigned
to intrnamebuf wasn't being freed.

Make the functions that display the top 8 lines externally visible so
they can be used to head other pages (not ready to commit yet...).
Use puthumanint() for oversize numbers when display_mode is RUN or BOOT (when
very big numbers are to be expected).
Allow an extra column for Csw..Flt.
Adjust some #defines to avoid use of global s & s1.

Split dkreadstats() into dkreadstats(), tkreadstats() and cpureadstats().
Similarly for dkswap().
Allows code to only call one of these.
Rename struct _disk to _vminfo to be nearer its contents.
Change 'systat vm' so that it always shows the 'current' cpu times, even
after ':run' or ':boot' commands. The code in vmstat.c doesn't support :run.

Add tape statistics.

do not rely on the pre-evcnt interrupt counter kernel symbols being present.
if they do not exist, then interrupt stats are all in evcnts.

WARNS=3

PR/29505: Nicolas Joly: Increase width of csw value in systat vmstat.

PR/29213: Nicolas Joly: sysstat(1) vmstat cannot display large memory values

Fix a display glitch when blanking out drive columns.

realloc pedant

Use correct size when copying interrupt counters.
Fixes second part of bin/10095 (first part fixed in rev 1.25)

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22365, verified by myself.

Discs->Disks

no need to #include <sys/dkstat.h>

use strlcpy

Pivot the disk stats into extra lines if they run out of columns
(approved by christos)

Fiddle with screen layout to generate room for longer labels on the
interrupt count fields.
(approved by christos)

Avoid displaying "intr" for all interrupt counter titles
(approved by christos)

Make kernel address arg of kvm_ckread() const void * so caller doesn't
need a cast.
(approved by christos)

kill warns.

pull interrupt stats from event counts
fix disk xfer byte count
fix absolute counts - were divided by time interval

Catch up to -current.

iostat(8) and systat(8) support for separate read/write disk statistics.
"iostat -x" now shows these (ala linux/solaris), but this is only splitting
the read/write bytes/transactions, not adding any new metrics.  "systat
iostat" now has two new commands to switch between combined/separate mode
for both it's numbers & bar modes.

PR/18408: Chris Demetriou: Kilo is abbreviated using a small k not a CAPITAL K.

introduce puthumanint() which calls humanize_number(), and use to
display disk transfer values (Suggested by Simon Burge). Also clip
%busy to 100 and display as an int which has the useful side effect
of stopping it overflowing into the next column (100.0).

scan utmpx/utmp.

Pull up revision 1.39 (requested by sommerfeld in ticket #406):
Since the KERN_CP_TIME sysctl reports total clock ticks across all
cpus and hz is measured in ticks per cpu, divide tick count by ncpu to
determine elapsed time since last sample.
Fixes I/O rate deflation observed on multiprocessors.

Since the KERN_CP_TIME sysctl reports total clock ticks across all
cpus and hz is measured in ticks per cpu, divide tick count by ncpu to
determine elapsed time since last sample.

Fixes I/O rate deflation observed on multiprocessors.

From Simon Burge: remove orphaned reference to _total; fixes PR bin/16804.

file vmstat.c was added on branch nathanw_sa on 2002-11-12 16:55:00 +0000

Make it compile (more vmstat fallout).

Since the system call and trap rates are often 5 digit numbers these
days we move the columns a little to avoid running into other numbers.

Remove extern variables and functions now declared in dkstats.h.
While here, remove 77 (!) unneed #includes.

Use the vm.uvmexp2 sysctl.

Pull up the following revisions, approved by releng-1-5:

- Add "boot", "run", "time" and "zero" commands to all IP displays. These work
  as in the "vmstat" display mode. The default mode is now "time", not "boot".
- ANSIfy.
- s@kre\(@vmstat\(@.
- __RCSID() police.
- Tweak inet.icmp display visual a little.

netstat.c        1.19
pigs.c           1.20
ps.c             1.16
swap.c           1.13
systat.1         1.20
systat.h         1.7
tcp.c            1.7
vmstat.c         1.33

- Add `boot', `run', `time' and `zero' commands to all IP displays. These work
  as in the `vmstat' display mode. The default mode is now `time', not `boot'.
- ANSIfy.
- s@kre\(@vmstat\(@.
- __RCSID() police.
- Tweak inet.icmp display visual a little.

remove include of <vm/vm.h>

Sync w/ netbsd-1-5-base.

Display disk busy statistics as `%busy', as it's less confusing.

Use hline() and variants in a bunch of places.

Fix a check so that holding down the space bar doesn't cause systat to lose.

Fix the CPU usage bar graph.

Use kern.cp_time to fetch cp_time[].  Don't support fetching it from
crash dumps yet, as that requires determining which CPU we should fetch
it from, etc.

include sys/sched.h to get definition of CPUSTATES

Another cp_time size fix - also, there are 5 CPUSTATES now not four...

Pull up revision 1.24 (requested by mycroft):
  Always do the errno indirection hack, so that non-threaded
  libraries get the right errno value when linked with -lpthread.
  This means "always include <errno.h> and never declare errno
  yourself".

Nuke `extern int errno;' in code we compile with -Wstrict-prototypes.  We get
the correct definition from errno.h.

Pull up to last week's -current.

Fix error handling throughout.  First off, it is not true as claimed in swap.c
that `systat doesn't handle errors'.  Second off, errx should not be used directly, since
the terminal should be cleaned up before bailing.  Third off, whatever we do we need
to be consistent.

There, I feel better now.

Two things:

  1.) fix a bug which caused coredumps when starting with no mode arguments
  2.) move to table-lookup for mode-specific command parsing as well.
      all command matching is now table-driven.

let "systat vmstat" say "1 user" not "1 users"

There's room in the systat-vmstat-iostat display, so allow four-letter
device names like e.g. ccd0 and print an extra digit of precision in
the 'sec' line like iostat(8) does.

completely remove Mach VM support.  all that is left is the all the
header files as UVM still uses (most of) these.

display the seconds in the timestamp in the corner, too.

avoid integer overflow in free memory report

Add missing braces, so PUTRATE() works correctly as an if clause.

Fix handling of privileges - the gid was given up before dkinit()
was called.
Pass the gid to use for KVM access explicitely to dkinit(), the caller
decides whether to call setgid(getgid()) or not.

- KNF
- use snprintf
- don't overwrite the keyboard buffer (and make this sized on
  the window size).

clean up memory totals in UVM case.

make "systat vmstat" much much much more UVM friendly.

build and run with -DUVM.  this isn't yet finished but it does run and partially work.

fix .Nm usage, deprecate register, getopt returns -1 not EOF, s/[br]*/[ms]*/

Lseek(2) usage cleanup: the use of L_SET/L_INCR/L_XTND is deprecated,
use SEEK_SET/SEEK_CUR/SEEK_END instead.

- some KNF.
- use __RCSID().
- WARNS=1

Freshen up a bit:

 - Replace deprecated sigblock() with sigprocmask()
 - Redraw the current display if SIGWINCH is caught
 - Style police

remove nlist lookup of _dk_*

New userland code to read the statistics kept by the NetBSD generic
disk framework, from John M. Vinopal <banshee@gabriella.resort.com>

various includes, casts, and cleanups...

Use err*(3)/warn*(3).

Changed to conform to NetBSD's new RCS Id convention.

imported from 44lite

Initial revision