Commit Graph

142 Commits

Author SHA1 Message Date
tjr
ddd5b3a66d Reimplement the vmstat -f option (display fork statistics).
PR:		50924
Submitted by:	Ken Stailey (with a few changes)
2003-04-14 07:21:03 +00:00
mux
b333e2476a Slightly rework formatting in vmstat -i so that it doesn't
break with "fooX irqY" lines that are a bit bigger.
2003-04-10 00:44:18 +00:00
phk
f432014308 Run a revision of the devstat interface:
Kernel:

Change statistics to use the *uptime() timescale (ie: relative to
boottime) rather than the UTC aligned timescale.  This makes the
device statistics code oblivious to clock steps.

Change timestamps to bintime format, they are cheaper.

Remove the "busy_count", and replace it with two counter fields:
"start_count" and "end_count", which are updated in the down and
up paths respectively.  This removes the locking constraint on
devstat.

Add a timestamp argument to devstat_start_transaction(), this will
normally be a timestamp set by the *_bio() function in bp->bio_t0.
Use this field to calculate duration of I/O operations.

Add two timestamp arguments to devstat_end_transaction(), one is
the current time, a NULL pointer means "take timestamp yourself",
the other is the timestamp of when this transaction started (see
above).

Change calculation of busy_time to operate on "the salami principle":
Only when we are idle, which we can determine by the start+end
counts being identical, do we update the "busy_from" field in the
down path.  In the up path we accumulate the timeslice in busy_time
and update busy_from.

Change the byte_* and num_* fields into two arrays: bytes[] and
operations[].

Userland:

Change the misleading "busy_time" name to be called "snap_time" and
make the time long double since that is what most users need anyway,
fill it using clock_gettime(CLOCK_MONOTONIC) to put it on the same
timescale as the kernel fields.

Change devstat_compute_etime() to operate on struct bintime.

Remove the version 2 legacy interface: the change to bintime makes
compatibility far too expensive.

Fix a bug in systat's "vm" page where boot relative busy times would
be bogus.

Bump __FreeBSD_version to 500107

Review & Collaboration by:	ken
2003-03-15 21:59:06 +00:00
phk
4dc0153e67 Update to use current rev of devstat API. 2003-03-15 21:25:44 +00:00
phk
9948f76f41 Add #include <sys/resource.h>
My apologies for missing these #includes, I must have confused the
dependencies with a wrong timestamp or something.
2003-02-16 16:01:52 +00:00
phk
4bfb37f22e Remove #include <sys/dkstat.h> 2003-02-16 14:13:23 +00:00
dillon
187e654d9a Make 'sysctl vm.vmtotal' work properly using updated patch from Hiten.
(the patch in the PR was stale).

PR:             kern/5689
Submitted by:   Hiten Pandya <hiten@unixdaemons.com>
2003-01-11 07:29:47 +00:00
tmm
c516cea85b The boottime variable in sys/kern/kern_tc.c is a struct timeval, not a
time_t, so do not use the latter as type when retrieving the variable
via libkvm. This should fix vmstat on sparc64.
2002-08-09 15:47:43 +00:00
charnier
abd215c87f The .Nm utility 2002-07-14 15:12:00 +00:00
joe
36c976074e Replace /kernel with /boot/kernel/kernel.
PR:		docs/37757
Submitted by:	Hiten Pandya <hiten@uk.FreeBSD.org>
2002-05-09 11:47:42 +00:00
jeff
da6660250e Remove malloc_type's ks_limit.
Updated the kmemzones logic such that the ks_size bitmap can be used as an
index into it to report the size of the zone used.

Create the kern.malloc sysctl which replaces the kvm mechanism to report
similar data.  This will provide an easy place for statistics aggregation if
malloc_type statistics become per cpu data.

Add some code ifdef'd under MALLOC_PROFILING to facilitate a tool for sizing
the malloc buckets.
2002-04-15 04:05:53 +00:00
asmodai
bb24e931b8 Fix a missed conversion of lld to llu for the uint64_t ks_calls and cast
to unsigned long long.

Don't be too overzealous with the printing of ks_calls in the total
statistics, cut back from 20 to 13 positions to print (which should last
a couple of years easily (20 digits is enough for 3168 years of calls at a
measly billion (10^9) calls per second.)).

Submitted by:	bde
2002-04-13 10:32:36 +00:00
asmodai
1c2992c7a6 Cast totreq to unsigned long long, as needed on 64-bit machines.
Pointed out by:	jeff
2002-04-08 21:06:14 +00:00
asmodai
3ca5a4b299 Change totreq to uint64_t from a long (the PR has an int64_t, which didn't
make sense to me) and change the printf argument from %8ld to %20llu to
accompany the printing of the totals.
Realigned the header printed above it as well.

PR:		32342
Submitted by:	ryan beasley <ryanb@goddamnbastard.org>
Reviewed by:	jeff, Tim J Robbins
2002-04-08 10:39:12 +00:00
imp
0b20191705 remove __P 2002-03-22 01:42:45 +00:00
jeff
d95a4801fc Remove the kmembuckets stats in preparation for the UMA commit. 2002-03-19 08:45:55 +00:00
markm
31d81e4fbc Remove NO_WERRORs and WARNS=n's. To be revisited after GCC3. 2002-02-08 23:07:37 +00:00
markm
7320009338 WARNS=2 fixes, but set NO_WERROR, as there are some HardToFix(tm)
warnings originating in system headers.
2001-12-11 22:59:36 +00:00
ru
d7e70183dd SECURITY: Drop `setgid kmem' bit as early as possible. 2001-08-31 16:26:37 +00:00
ken
2b48a1a614 Change the compute_stats() call to the new devstat_compute_statistics()
interface.

Cast the return of the rest of the printfs in here to void.

Submitted by:	"Sergey A. Osokin" <osa@freebsd.org.ru>
2001-08-11 19:41:56 +00:00
tmm
3ea330259b Correct the old length argument passed to sysctl to be a pointer to a
size_t (not to an int).

MFC after:	2 days
2001-07-29 21:56:14 +00:00
dd
911ca14c87 Remove whitespace at EOL. 2001-07-15 08:06:20 +00:00
ru
36f138439b mdoc(7) police: removed HISTORY info from the .Os call. 2001-07-10 14:16:33 +00:00
schweikh
9e705f87d9 Increase column widths when using -i (they are now wide enough to
hold a 64bit or 32bit ~0 value, i.e. 20 and 10; this anticipates
soon-to-be machines with Exahertz rtc interrupt frequencies. :-)

PR:		bin/16206
Submitted by:	John Capo <jc@irbs.com>
MFC after:	1 week
2001-06-26 18:49:10 +00:00
schweikh
31ec6670ae Reduce field width for some columns so that the default output fits in <= 79
columns. 80 columns + newline is a problem for some terminals including syscons.

Requested by:	bde
MFC after:	1 week
2001-06-23 17:52:10 +00:00
schweikh
79e3ccfb6f Made all fields in default output be space separated. Run-together
columns confuse the heck out of other apps trying to parse vmstat output
(eg sscope). I made sure we're still <= 80 cols per line.
Fixed warnings about unused vars and printf %format mismatches.

Requested by:	Eugene Aleynikov <eugenea@infospace.com>
Reviewed by:	joerg (implicitly)
MFC after:	2 weeks
2001-06-19 17:59:40 +00:00
schweikh
ec5e03bd09 Avoid the avm field joining the w field when avm is > 9.999.999 pages
which is slightly less than 4GB. To use a quote from someone who shall
remain nameless "No one will ever need more than 4 GB" :-) But FreeBSD
is prepared if we one day will.

Requested by:	Eugene Aleynikov <eugenea@infospace.com>
2001-06-13 18:43:28 +00:00
schweikh
bdb89dc451 Increase field width by one for 'fre' to accomodate today's memory sizes.
PR:		25267
Submitted by:	Eugene Aleynikov <eugene@infospace.com>
Reviewed by:	joerg
MFC after:	2 weeks
2001-06-12 19:47:40 +00:00
ru
52a9144c8b Removed -I${.CURDIR}/.../sys from CFLAGS. 2001-05-18 13:41:42 +00:00
ru
89596e4538 MAN[1-9] -> MAN. 2001-03-27 10:52:19 +00:00
alfred
3956d542bf fix usage statement (add missing [-n devs] option)
Submitted by: Maxim Konovalov <maxim@macomnet.ru>

Silence a warning by renaming the 'pgtok' #define to 'vmstat_pgtok' so
as not to conflict with the 'pgtok' #define in sys/param.h
2001-02-22 13:55:12 +00:00
ru
8a6f8b5fe4 mdoc(7) police: split punctuation characters + misc fixes. 2001-02-01 16:38:02 +00:00
ume
1ae749987d Add mibs to hold the number of forks since boot. New mibs are:
vm.stats.vm.v_forks
	vm.stats.vm.v_vforks
	vm.stats.vm.v_rforks
	vm.stats.vm.v_kthreads
	vm.stats.vm.v_forkpages
	vm.stats.vm.v_vforkpages
	vm.stats.vm.v_rforkpages
	vm.stats.vm.v_kthreadpages

Submitted by:	Paul Herman <pherman@frenchfries.net>
Reviewed by:	alfred
2001-01-23 14:32:01 +00:00
des
9373359bf7 Document that the -z option is equivalent to 'sysctl vm.zone'. 2001-01-23 00:37:54 +00:00
des
efffbed318 Use the vm.zone sysctl rather that grope through the zone allocator's
internal data structures.
2001-01-23 00:31:56 +00:00
mjacob
16f8aaa409 Update vm zone list traversal for changes made to kernel. Note that this
is ultimately silly because no locks are held in user space while traversing
the list via kvm_reads... really, this should use the sysctl interface
which *is* protected by a lock in the kernel.
2001-01-23 00:09:30 +00:00
ru
e6cfc0711d Prepare for mdoc(7)NG. 2000-12-19 16:00:12 +00:00
ru
0d1334ca0c mdoc(7) police: use the new features of the Nm macro. 2000-11-20 19:21:22 +00:00
phk
f5e4ff159a Remove unneeded #include <sys/buf.h> 2000-05-05 16:07:10 +00:00
phk
237070fe4d unifdef -Uvax -Uhp300 -Uluna68k -Umips -Utahoe 1999-09-01 11:25:25 +00:00
peter
3b842d34e8 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
n_hibma
a7afbdeb6b Convert interrupt count from signed to unsigned and the total
from signed long to unsigned lon long.

PR:		12808
Submitted by:	Kevin Day toasty@dragondata.com
Reviewed by:	bde
1999-07-26 09:18:26 +00:00
kris
ebc36fcc1a Correct description of -c and -w options
Inspired by:	PR docs/11774
Submitted by:	Chad R. Larson <chad@freeway.dcfinc.com>
1999-06-06 14:16:51 +00:00
bde
4852bd7ff2 Backed out the previous commit, except for the parts that reduced
the magicness of 200.  Cleaned up the remaining parts.  Circularisation
of the list of malloc types was a kernel bug (now fixed).  Interfering
with applications' definitions of pgtok is a system header bug (not
fixed).
1999-05-12 11:49:47 +00:00
imp
bb52f35f49 Sometime since this file was written, the list of kernel malloc types
changed from a simple list to a circular one.  We compensate by only
looping until we see the first address again.  Before, things would
terminate because it was limited to 200 iterations.  This lead to
bogus statistics and repeating stats for memory types.

This should be merged into 3.2, as the same bug is there.
1999-05-10 00:33:32 +00:00
kris
0661f43043 Move an option outside of a nested list and up a bit to live free among
its brothers and sisters.
1999-04-26 14:08:04 +00:00
bde
9e450d21be Fixed bitrot in usage message and disordering of options in previous commit.
I'm not sure why we have `mvstat -z'.  `sysctl vm.zone' gives more
information.  OTOH, `sysctl vm.zone' shouldn't return ASCII data,
and reporting of memory use should be integrated, at least as an
option.
1999-02-15 14:15:28 +00:00
bde
4cd21ac75e Fixed disordering of options in previous commit. 1999-02-15 13:57:18 +00:00
dillon
1ff9917e47 Add -z option to vmstat to dump data from the zone allocator 1999-02-13 09:59:24 +00:00
ken
10cc51ce30 Fix vmstat display problems. The header printout wasn't quite right, and
the display wrapped around.

This decreases the default maximum number of disks shown to 2, so things
don't wrap around so easily.  Also, it fixes the header display issues.

Submitted by:	Bruce Evans <bde@FreeBSD.ORG>
1999-02-10 00:46:27 +00:00
ken
542b263658 Add a prioritization field to the devstat_add_entry() call so that
peripheral drivers can determine where in the devstat(9) list they are
inserted.

This requires recompilation of libdevstat, systat, vmstat, rpc.rstatd, and
any ports that depend on the devstat code, since the size of the devstat
structure has changed.  The devstat version number has been incremented as
well to reflect the change.

This sorts devices in the devstat list in "more interesting" to "less
interesting" order.  So, for instance, da devices are now more important
than floppy drives, and so will appear before floppy drives in the default
output from systat, iostat, vmstat, etc.

The order of devices is, for now, kept in a central table in devicestat.h.
If individual drivers were able to make a meaningful decision on what
priority they should be at attach time, we could consider splitting the
priority information out into the various drivers.  For now, though, they
have no way of knowing that, so it's easier to put them in an easy to find
table.

Also, move the checkversion() call in vmstat(8) to a more logical place.

Thanks to Bruce and David O'Brien for suggestions, for reviewing this, and
for putting up with the long time it has taken me to commit it.  Bruce did
object somewhat to the central priority table (he would rather the
priorities be distributed in each driver), so his objection is duly noted
here.

Reviewed by:	bde, obrien
1999-02-10 00:04:13 +00:00
jdp
5b35be6f12 Back out previous work-around for "vmstat -i" failing on ELF
kernels.  A better fix is now committed to "src/lib/libc/gen/nlist.c"
and "src/usr.sbin/kvm_mkdb/nlist.c".
1998-10-28 06:41:24 +00:00
msmith
b628626c22 Work around some variables having N_UNDF types but valid values; this
makes vmstat work on ELF kernels again.
Submitted by:	Daniel Rock <rock@cs.uni-sb.de>
1998-10-24 23:12:09 +00:00
ken
7c2e7bb880 Change the devstat generation number from an int to a long. The int-sized
generation was causing unaligned access faults on the Alpha.

I have incremented the devstat version number, since this is an interface
change.  You'll need to recompile libdevstat, systat, iostat, vmstat and
rpc.rstatd along with your kernel.

Partially Submitted by:	Andrew Gallatin <gallatin@cs.duke.edu>
1998-09-20 00:11:23 +00:00
dillon
8c0ba7f814 vmstat shows all manually-specified devices rather then just the first
three.
1998-09-16 18:20:23 +00:00
ken
f63b826ac0 Delete unused code. This has been obsoleted by the new devstat code.
Reviewed by:	imp
1998-09-16 00:25:54 +00:00
gibbs
b954e9c264 Update system to new device statistics code.
Submitted by:	"Kenneth D. Merry" <ken@plutotech.com>
1998-09-15 08:16:45 +00:00
msmith
565226fa1c Terminate the defdrives array correctly. (Shame, Rod!)
Submitted by:	Scott Michel <scottm@cs.ucla.edu>
1998-09-09 02:22:28 +00:00
bde
0609531ab6 Fixed printf format errors. 1998-07-06 21:01:54 +00:00
dyson
a620a26471 Support a couple of new "-s" stats. 1998-03-07 23:40:23 +00:00
bde
dbfaf6f7a4 Const poisoning from ks_shortdesc. 1997-12-05 19:28:28 +00:00
phk
f1a5d63a7b struct kmemstats was renamed. 1997-10-10 18:19:48 +00:00
phk
ad5c9a1c33 Make vmstat understand the dynamic malloc stuff. There are a number
of ugly hardcoded constants in there.
1997-10-10 14:08:07 +00:00
dima
c345be1851 Be more specific about -f/-t options (they're not yet implemented),
not just exit with 0 status.

This definitely should go to 2.2.5.
If i won't have any objections - I'll commit it tonight.
1997-10-06 18:52:16 +00:00
charnier
5aeacfdd37 Use err(3). Add some %d to %ld changes. 1997-08-25 06:40:05 +00:00
steve
c533a8d3b5 Cleanup inconsistencies in the manpage.
PR:		docs/3709
Submitted by:	Takahiro Yugawa <yugawa@orleans.rim.or.jp>
1997-08-23 21:42:46 +00:00
imp
141381e1cb compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.
1997-03-29 04:34:07 +00:00
scrappy
3e65976742 Slight visual formatting change to the output so that:
procs   memory     page                    disks   faults      cpu
 r b w   avm   fre  flt  re  pi  po  fr  sr w0 w1   in   sy  cs us sy id
 1 0 04135184  6016  180   2   1   0 158 135 10  0  386 1820  77 20  6 74

looks like:

 procs      memory     page                    disks   faults      cpu
 r b w     avm   fre  flt  re  pi  po  fr  sr w0 w1   in   sy  cs us sy id
 1 0 0 4135188  6016  180   2   1   0 158 135 10  0  387 1821  77 20  6 74
1997-03-16 23:11:07 +00:00
mpp
47927ebd5c Make the man page agree with the actual vmstat output
and options.
1997-01-09 06:49:33 +00:00
bde
11546f4616 Fixed DPADD. 1996-09-05 17:16:10 +00:00
mpp
8af7d5dcdd Change a stray reference to pstat to vmstat.
Pointed-out-by: bde
1996-08-24 16:12:53 +00:00
mpp
748de7f8e2 Convert to mdoc format. 1996-08-23 21:40:59 +00:00
joerg
2adcf98b06 Correct a typo.
Submitted by:	mbarkah@hemi.com (Ade Barkah)
1996-04-30 05:20:32 +00:00
jkh
7e37c839a0 Print number of second-level cache hits as per-directory, not per-process
(since they're per-directory now).
Learned from: Kirk McKusick's OS internals course.. :-)
1996-03-03 09:06:59 +00:00
bde
06e92e8fee Reduced vm dependencies. Only `struct vmmeter.h' is required.
Unfortunately, the sysctl number for reading this struct is
bogusly placed in <vm/vm_param.h> instead of with the declaration
of the struct.
1995-12-13 15:01:13 +00:00
peter
160e301cbc add a #include <sys/vmmeter.h> since we are using the vmmeter structures
and this was once (but no longer it seems) included by <vm/vm.h>
It should now compile again.
1995-12-13 11:33:34 +00:00
rgrimes
a14d555c87 Remove trailing whitespace. 1995-05-30 06:41:30 +00:00
dg
c510e7263f Removed object lookup/hit count and changed the order of things a little. 1995-03-25 08:44:48 +00:00
dg
e859f0ca16 Removed printing of cnt.v_nzfod: we don't implement this in the kernel. 1995-03-25 06:11:43 +00:00
dg
028f7bbfb0 Added 'pages in VM cache' statistic. 1995-01-10 05:52:59 +00:00
ats
755efec3d9 change a .TH VMSTAT 1 to a .TH VMSTAT 8 . 1994-12-12 00:26:08 +00:00
phk
f36d4baf8e More absolute paths 1994-11-21 00:17:10 +00:00
dg
760a1ff3ea Made zero-fill stats a bit more clear. 1994-10-18 15:17:09 +00:00
dg
fd05e6fbc0 Updated to changes in struct vmmeter and reorganized -s stats to be more
logical.
1994-10-18 15:00:06 +00:00
dg
7333a06cbb Restore all of my changes that Garrett clobbered in the previous commit. 1994-10-17 10:34:42 +00:00
wollman
efe252383a New way of getting disk drive names. 1994-10-16 04:04:56 +00:00
dg
6c5c5a9444 Updated to changes in struct vmmeter. Nuked !NEWVM code. Fixed rounding
bug when interval is 1 second.
1994-10-15 13:36:32 +00:00
phk
f87d72f160 Realigned the output of "vmstat -m", "MSDOSFS mount" was too wide for the
field.  Saved some space and gained a little clarity by printing "128K"
instead of 131072 (and so on).
1994-10-05 04:52:47 +00:00
wollman
3ac06aac07 More merry makefile munging for man page compatability. 1994-08-05 19:00:04 +00:00
dg
6b466831f4 Converted 'vmunix' to 'kernel'. 1994-08-05 09:14:37 +00:00
rgrimes
573f71ed7a Add read_names support for i386, based on my original work from FreeBSD
and cleaned up slightly.
1994-05-29 06:19:34 +00:00
rgrimes
f9ab90d9d6 BSD 4.4 Lite Usr.bin Sources 1994-05-27 12:33:43 +00:00