Commit Graph

181 Commits

Author SHA1 Message Date
Bosko Milekic
70a61707f6 Re-enable mbtypes statistics in the mbuf allocator. I disabled these
when I changed the allocator bits. This implements per-CPU mbtypes
stats by keeping net number of decrements/increments of a given mbtype
per-CPU and then summing all of the per-CPU mbtypes to produce the total
net number of allocated mbufs of the given mbtype.
Counters are carefully balanced to avoid/prevent underflows/overflows.

mbtypes stats are re-enabled with the idea that we may occasionally
(although very rarely) observe slight inconsistencies in the stat
reporting. Most of the time, we should be fine, though.

Also make appropriate modifications to netstat(1) and systat(1) to do
the necessary reporting.

Submitted by: Jiangyi Liu <jyliu@163.net>
2001-09-30 01:58:39 +00:00
Kenneth D. Merry
8f29de8be3 Convert systat(1) to use the new devstat interface.
Submitted by:	"Sergey A. Osokin" <osa@freebsd.org.ru>
2001-09-06 04:06:12 +00:00
Bosko Milekic
49f854f926 - Do not handle the per-CPU containers in mbuf code as though the cpuids
were indices in a dense array. The cpuids are a sparse set and treat
  them as such, setting up containers only for CPUs activated during
  mb_init().

- Fix netstat(1) and systat(1) to treat the per-CPU stats area as a sparse
  map, in accordance with the above.

This allows us to properly boot with certain CPUs disactivated. However, if
we later decide to re-activate said CPUs, we will barf until we decide to
implement CPU spinon/spinoff callback hooks to allow for said CPUs' per-CPU
containers to get configured on their activation.

Reported by: mjacob
Partially (sys/ diffs) Submitted by: mjacob
2001-07-26 18:47:46 +00:00
Dima Dorfman
f247324df7 Remove whitespace at EOL. 2001-07-15 08:06:20 +00:00
Ruslan Ermilov
625003720a mdoc(7) police: removed HISTORY info from the .Os call. 2001-07-10 14:16:33 +00:00
Ruslan Ermilov
5521ff5a4d mdoc(7) police: sort SEE ALSO xrefs (sort -b -f +2 -3 +1 -2). 2001-07-06 16:46:48 +00:00
Bosko Milekic
4edec6b79a Make sure to try hw.ncpu if kern.smp.cpus doesn't exist (i.e. on UP) when
getting number of CPUs.
2001-06-23 17:03:27 +00:00
Bosko Milekic
08442f8a82 Introduce numerous SMP friendly changes to the mbuf allocator. Namely,
introduce a modified allocation mechanism for mbufs and mbuf clusters; one
which can scale under SMP and which offers the possibility of resource
reclamation to be implemented in the future. Notable advantages:

 o Reduce contention for SMP by offering per-CPU pools and locks.
 o Better use of data cache due to per-CPU pools.
 o Much less code cache pollution due to excessively large allocation macros.
 o Framework for `grouping' objects from same page together so as to be able
   to possibly free wired-down pages back to the system if they are no longer
   needed by the network stacks.

 Additional things changed with this addition:

  - Moved some mbuf specific declarations and initializations from
    sys/conf/param.c into mbuf-specific code where they belong.
  - m_getclr() has been renamed to m_get_clrd() because the old name is really
    confusing. m_getclr() HAS been preserved though and is defined to the new
    name. No tree sweep has been done "to change the interface," as the old
    name will continue to be supported and is not depracated. The change was
    merely done because m_getclr() sounds too much like "m_get a cluster."
  - TEMPORARILY disabled mbtypes statistics displaying in netstat(1) and
    systat(1) (see TODO below).
  - Fixed systat(1) to display number of "free mbufs" based on new per-CPU
    stat structures.
  - Fixed netstat(1) to display new per-CPU stats based on sysctl-exported
    per-CPU stat structures. All infos are fetched via sysctl.

 TODO (in order of priority):

  - Re-enable mbtypes statistics in both netstat(1) and systat(1) after
    introducing an SMP friendly way to collect the mbtypes stats under the
    already introduced per-CPU locks (i.e. hopefully don't use atomic() - it
    seems too costly for a mere stat update, especially when other locks are
    already present).
  - Optionally have systat(1) display not only "total free mbufs" but also
    "total free mbufs per CPU pool."
  - Fix minor length-fetching issues in netstat(1) related to recently
    re-enabled option to read mbuf stats from a core file.
  - Move reference counters at least for mbuf clusters into an unused portion
    of the cluster itself, to save space and need to allocate a counter.
  - Look into introducing resource freeing possibly from a kproc.

Reviewed by (in parts): jlemon, jake, silby, terry
Tested by: jlemon (Intel & Alpha), mjacob (Intel & Alpha)
Preliminary performance measurements: jlemon (and me, obviously)
URL: http://people.freebsd.org/~bmilekic/mb_alloc/
2001-06-22 06:35:32 +00:00
Thomas Moestl
d62de5c4bb Replace a use of the hw.nintr sysctl as it has just gone away, cast
size_t variables when passing them to a printf-like function, and some
minor cleanups.
2001-06-01 13:29:19 +00:00
Ruslan Ermilov
18fbb861ab Display -tcp w/o load average so that all statistics fits on a 80x25 screen. 2001-05-31 07:14:52 +00:00
Ruslan Ermilov
7bbf75ec4f Show TCP checksum failures with -tcp display.
PR:		bin/27786
Submitted by:	Brooks Davis <brooks@one-eyed-alien.net>
2001-05-31 07:08:49 +00:00
Kris Kennaway
096c40e3f3 Mark error() as __printflike() and fix a non-exploitable format string
error.

MFC after:	1 week
2001-05-25 23:15:05 +00:00
Thomas Moestl
5a3c3d039a Fix the error buffer passed to kvm_openfiles to have a length of
_POSIX2_LINE_MAX as required.
While being there, wrap an overly long line.

MFC after:	3 days
2001-05-25 23:10:27 +00:00
Ruslan Ermilov
3ab9a9d0e0 Removed -I${.CURDIR}/.../sys from CFLAGS. 2001-05-18 13:41:42 +00:00
Mark Murray
6e547eabb8 Compensate for header dethreading. 2001-05-01 08:46:02 +00:00
Andrew Gallatin
0b8b714fa9 numdirtybuffers is an int, not a long. 2001-03-29 02:18:19 +00:00
Thomas Moestl
342e2faa09 Get rid of setgid kmem for systat, and while being there, fix some bugs
and compiler warnings.
The data for network statistics are still obtained via the kvm interface
if systat was started with the needed privileges, otherwise sysctls are
used. The reason for this is that with really many open sockets, the
sysctl method is probably slower, but it systat -netstat is probably not
really usable in either mode under these conditions.

Approved by:	rwatson
2001-03-23 03:58:25 +00:00
Andrey A. Chernov
6ab831378a Don't attempt to parse %c 2001-03-21 20:32:20 +00:00
Ruslan Ermilov
fb9aaba000 Count and show incoming UDP datagrams with no checksum. 2001-03-13 13:26:06 +00:00
Ruslan Ermilov
d0353b836e mdoc(7) police: split punctuation characters + misc fixes. 2001-02-01 16:38:02 +00:00
John Baldwin
ad7b044802 Catch up to new proc flags. 2001-01-24 14:03:34 +00:00
Poul-Henning Kamp
1009e5708d My bad, committed the submitted patch rather than the fixed patch. 2000-12-30 21:56:18 +00:00
Poul-Henning Kamp
539d2b38e2 Use macro API to <sys/queue.h>
Submitted by:	"Jason" <jsmethers@pdq.net>
Reviewed by:	phk
2000-12-30 21:17:03 +00:00
Ruslan Ermilov
9b88faecd3 Prepare for mdoc(7)NG. 2000-12-19 16:00:12 +00:00
Robert Watson
48c193e183 o Fix up includes which built due to excessive nested including in the
base system, but not in BruceBSD.
o Fix up style violations of various sorts.
o Remove redundant normalization of hertz variable, as the sysctl handler
  does this work (unlike when kread was used).

Submitted by:	bde
2000-12-17 18:43:28 +00:00
Kirk McKusick
1f7d250182 Change the proc information returned from the kernel so that it
no longer contains kernel specific data structures, but rather
only scalar values and structures that are already part of the
kernel/user interface, specifically rusage and rtprio. It no
longer contains proc, session, pcred, ucred, procsig, vmspace,
pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If
any of these changed in size, ps, w, fstat, gcore, systat, and
top would all stop working. The new structure has over 200 bytes
of unassigned space for future values to be added, yet is nearly
100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
Andrew Gallatin
19f085228f Correct int/long type mismatch in the proper place this time. freevnodes
and numvnodes are longs in the kernel.  They should remain longs in systat,
what really needs to change is that they should be using SYSCTL_LONG rather
than SYSCTL_INT.   I also changed wantfreevnodes to SYSCTL_LONG because I
happened to notice it.

I wish there was a way to find all of these automatically..

Pointed out by: bde
2000-12-02 20:08:33 +00:00
Andrew Gallatin
36acf3d991 fix another int/long type mismatch. This one was causing pigs to
die with an fpe on alpha because fscale wasn't properly initted
2000-12-01 20:57:02 +00:00
Andrew Gallatin
d468ee6f1a fix int/long type mismatches found on alpha 2000-12-01 20:01:38 +00:00
Robert Watson
c3a2720353 o Make systat/vmstat.c use sysctl() to retrieve cp_time, bufspace,
maxvnodes, numvnodes, freevnodes, nchstats, and numdirtybuffers.
o Make the hw.ncpu error checking code a little more rigorous by
  sanity checking the returned data size.
o Didn't fix machine-dependent non-sysctl-exported variables:
  intrnames, eintrnames, intrcnt, eintrcnt, as these variables are
  defined and exported from machine-dependent kernel code in
  assembly.  This should probably be fixed somehow.
2000-11-25 03:53:42 +00:00
Robert Watson
00df22775a o make systat/pigs.c use syctl() to retrieve cp_time, fscale, and ccpu
instead of using kmem.
2000-11-25 03:49:42 +00:00
Robert Watson
8c82fe65a7 o Make systat/iostat.c use sysctl() to retrieve cp_time instead of
kmem.
2000-11-25 03:47:36 +00:00
Robert Watson
7ace4e618a o Make systat use sysctl() to retrieve hz and stathz, instead of
using kmem.
2000-11-25 03:46:45 +00:00
Ruslan Ermilov
8fe908ef0c mdoc(7) police: use the new features of the Nm macro. 2000-11-20 19:21:22 +00:00
Chris D. Faulhaber
2d45aed6bc Remove obsolete /dev/drum references
Reviewed by:	alex, asmodai, billf
2000-10-29 12:19:52 +00:00
Andrey A. Chernov
2aed24b487 Remove unneded -ltermcap 2000-09-16 03:30:50 +00:00
Peter Wemm
540bc8d6e1 Quick Fix: swap.c doesn't appear to actually need <sys/conf.h>, so remove
it to try and get world building again.  (sys/conf.h now depends on
sys/types.h)
2000-08-24 20:22:44 +00:00
Alfred Perlstein
2873654a65 Fix systat to use the kern.ipc.mbtypes sysctl instead of referencing a
structure member that doesn't exist anymore.
Use getsysctlbyname for kern.ipc.mbstat instead of sysctl.
Use netstat's method of displaying values from mtnames.

Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
Missed by PR: 19809
2000-07-15 16:24:21 +00:00
Poul-Henning Kamp
fb7a8c91b8 Duh! get the scaling right. 2000-06-01 08:49:46 +00:00
Poul-Henning Kamp
0e5064d228 Rescale the IOstat bars, modern disks are faster than old disks. 2000-06-01 08:26:13 +00:00
Poul-Henning Kamp
9df46d4a2a Don't include <sys/buf.h> 2000-05-05 15:41:22 +00:00
Warner Losh
0e7f0658ee #include <errno.h> where needed. Kill extern int errno;.
Minor warnings in tip corrected.
2000-04-14 06:39:19 +00:00
Sheldon Hearn
4e86fcacf6 Remove more single-space hard sentence breaks. 2000-03-02 14:54:02 +00:00
Nik Clayton
436aece8db s/curses/ncurses/
PR:             docs/17061
Submitted by:   Udo Erdelhoff <ue@nathan.ruhr.de>
2000-03-01 10:46:05 +00:00
Brian Feldman
2b543de8c6 "Disks" is more correct than "Disks" could be. 1999-09-19 18:04:54 +00:00
Peter Wemm
3879bee426 systat is way too comfortable with curses internals... 1999-08-30 08:18:09 +00:00
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
Chris Costello
0114ca66e9 Fix bad references:
vmstat(1) -> vmstat(8)
  iostat(1) -> iostat(8)
1999-08-14 06:52:28 +00:00
Dag-Erling Smørgrav
a4a026b4c0 Show dirty buffers and the percentage of time a disk was busy.
PR:		12858
Submitted by:	Arjan de Vet <Arjan.deVet@adv.iae.nl>
1999-07-30 07:44:25 +00:00
Nik Clayton
3be5f1f5ce Add $Id$, to make it simpler for members of the translation teams to
track.

The $Id$ line is normally at the bottom of the main comment block in the
man page, separated from the rest of the manpage by an empty comment,
like so;

     .\"    $Id$
     .\"

If the immediately preceding comment is a @(#) format ID marker than the
the $Id$ will line up underneath it with no intervening blank lines.
Otherwise, an additional blank line is inserted.

Approved by:            bde
1999-07-12 20:24:20 +00:00
Peter Wemm
bf0e1ee370 Tidy up references to <sys/rlist.h> and support for the old swap management
that went away in January.
1999-05-11 14:32:18 +00:00
Bruce Evans
0af0a4b0f4 Display floats with format %*.0f instead of as "*****" if there is
enough space for this but not enough space for the normal %*.*f
format.  Similarly for long doubles.
1999-03-22 03:44:01 +00:00
Matthew Dillon
2d7142ca1a Include discrete ozfod as well as ozfod/zfod percentage. 1999-02-08 02:39:45 +00:00
Matthew Dillon
8b4c04d3f3 If there are 4 or fewer disk devices, we have room to display additional
VM statistics.  zfod is moved and %slo-z ( percentage of zero-fills that
    were slow, i.e. not pre-zero'd ), and number of pages freed per second.
1999-02-08 02:11:52 +00:00
Matthew Dillon
300c6da23d Be nice when no swap is configured in system 1999-02-06 06:43:56 +00:00
Matthew Dillon
4aa513f41d Fix labeling bug 1999-01-22 10:57:50 +00:00
Matthew Dillon
e53c5e2053 Make systat -swap use new kvm_swapinfo() function 1999-01-22 10:53:13 +00:00
David E. O'Brien
154a13b5f8 revert to rev 1.29. (floppy drives will be gotten rid of another way) 1999-01-09 06:03:54 +00:00
David E. O'Brien
587c729bb3 Add copyright and RCS/CVS Id.
Noticed by:	ken
1998-12-27 21:44:03 +00:00
David E. O'Brien
d623448808 Update section on DK_NDRIVES (which was removed with CAM), and explain
relation to devstat(3)/(9).

Submitted-by:	ken@freebsd.org
1998-12-27 21:38:09 +00:00
David E. O'Brien
4ae16510d1 Turn the compile time option into a run-time option.
You can now use the `want_fd' command in the vmstat display.

Suggested by:	grog
1998-12-27 17:59:42 +00:00
David E. O'Brien
5647c79de5 Don't waste precious space on showing the performance of fdX.
(can get old behavior with -DWANT_FD)
1998-12-27 08:15:37 +00:00
David E. O'Brien
d22889b821 Quiet many compiler warnings. 1998-10-08 09:56:10 +00:00
Kenneth D. Merry
2459ccb484 Fix a core-dump situation in ":boot" mode in the vmstat display.
Reported by:	bde
1998-10-05 04:04:27 +00:00
Kenneth D. Merry
bcc6a3da92 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
Kenneth D. Merry
8b95823257 Delete unused code. This has been obsoleted by the new devstat code.
Reviewed by:	imp
1998-09-16 00:25:54 +00:00
Justin T. Gibbs
86e492ee46 Reference new files for device stat support. 1998-09-15 10:28:59 +00:00
Justin T. Gibbs
8d2fbde504 Update system to new device statistics code.
Submitted by:	"Kenneth D. Merry" <ken@plutotech.com>
1998-09-15 08:16:45 +00:00
Joseph Koshy
1c79dc84fd Add missing comma.
PR:		7841
Submitted by:	NOKUBI Hirotaka <hnokubi@yyy.or.jp>
1998-09-09 03:07:03 +00:00
Bruce Evans
81a4459b5f Fixed type mismatches which were fatal when sizeof(long) > sizeof(int). 1998-07-06 22:08:00 +00:00
Guy Helmer
a57a22d25f Update vmstat portion of man page to reflect the statistics currently
shown by systat's vmstat display.
PR:		docs/3764
1998-06-25 22:04:48 +00:00
Peter Wemm
9ec49abd00 #include <arpa/inet.h> 1998-06-12 14:18:33 +00:00
Warner Losh
448b84a0e4 o Use snprintf rather than sprintf
o Add more checks for buffer overflows
o Use snprintf rather than strcat/cpy and have better checks for max
  length exceeded.

Most of these changes are not exploitable buffer overruns, but it never
hurts to be safe.

Inspired by and obtained from: OpenBSD
1998-06-09 04:17:29 +00:00
John Hay
73cdb7fd38 Correctly display the interrupt counts.
Reviewed with optimizations by:	Tor Egge <tegge>
1998-05-27 21:01:37 +00:00
Steve Price
794313942d Use 'proto <tcp|udp|all>' to select the protocol to display
in netstat-mode to avoid a conflict with tcp-mode.  Also
while documenting this new feature in the manpage, fix a
minor display nit.

PR:		5159
Submitted by:	Sergei Chechetkin <csl@whale.sunbay.crimea.ua>
1997-12-04 03:44:46 +00:00
John Polstra
abe6c636d0 Fix: too many arguments for format in call to sprintf(). 1997-11-18 05:53:03 +00:00
Wolfram Schneider
bf5cbf3551 Sort cross refereces in section SEE ALSO. 1997-09-29 19:11:55 +00:00
Garrett Wollman
630fa006b9 Having done ICMP, UDP, and IP, could a TCP display be far behind? 1997-09-27 00:44:55 +00:00
Peter Wemm
39253d4c87 Show size of vnode pool in vmstat mode. 1997-09-25 01:14:25 +00:00
Garrett Wollman
2938fb783c Emboldened by the success of yesterday's ICMP statistics display,
I've now added one that does IP (and also UDP) statistics.
1997-09-25 00:37:32 +00:00
Garrett Wollman
03e00a72c6 Add a mode to display ICMP statistics.
Inspired by:	IRIX netstat -C
1997-09-24 02:43:45 +00:00
Philippe Charnier
014927909d Main() returns int. 1997-08-26 11:08:24 +00:00
Philippe Charnier
d8793dfac3 Use err(3). /sys/dkstat.h -> /usr/include/sys/dkstat.h 1997-08-13 06:45:11 +00:00
Bruce Evans
a15f578988 Merge from Lite2 (print "??" instead NULL if devname() fails). More
faithful stealing from pstat would have given this already.
1997-07-06 04:37:22 +00:00
Bruce Evans
237f53369c Importing Lite2 broke lookup() to return -1 for the nmatches == 0 case.
Fixed.
1997-07-06 04:13:20 +00:00
Bruce Evans
94143ce785 This commit was generated by cvs2svn to compensate for changes in r27229,
which included commits to RCS files with non-trunk default branches.
1997-07-06 04:02:30 +00:00
Bruce Evans
ff6c33c9e8 Import Lite2's src/usr.bin/systat. cmds.c is still on the vendor branch
and this import just breaks it.
1997-07-06 04:02:30 +00:00
Garrett Wollman
646bbae242 Use new sysctl(3) interface to mbuf statistics. While we're at it,
count free mbufs correctly.
1997-02-24 20:59:03 +00:00
Peter Wemm
c115df18cd Revert $FreeBSD$ to $Id$ 1997-02-22 19:58:13 +00:00
David E. O'Brien
bdbbe98ba5 The screen layout of the lefthand side for the vmstat display was way off.
(based on my running it on 2.2-GAMMA)
1997-02-15 21:01:38 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Joerg Wunsch
6b5d41d069 Fix the following old problem:
date: 1994/10/09 07:37:18;  author: davidg;  state: Exp;  lines: +7 -1
  #if 0'd out the meat of the swap code until I get a chance to rewrite it.

...mainly by stealing the code from pstat(8).
1997-01-12 19:38:32 +00:00
Jordan K. Hubbard
b2ff494ac6 Now that systat's working again, bring the vmstat cleanup over from
-stable.
1996-11-12 19:16:46 +00:00
Bruce Evans
adb844d545 Initialize interrupt counters. The boot time values were displayed as ***.
Should be in 2.2.

Pointed out by:	/etc/malloc.conf -> AJ
1996-11-10 08:30:18 +00:00
Poul-Henning Kamp
00cb92bf59 bin/1942 curses problem in systat
truncate if too long for field.
2.2 candidate.
1996-11-02 15:15:40 +00:00
Garrett Wollman
3e1c3ca6bb Eliminate unnecessary include of <sys/mbuf.h>. 1996-10-28 19:08:13 +00:00
Bruce Evans
4523edce8b Really eliminated includes of the "temporary" backwards compatibility
header <sys/dir.h> in applications.  My previous sweep didn't find the
places that included it without needing it.
1996-09-24 08:43:04 +00:00
Bruce Evans
5b963fa12e Fixed DPADD. 1996-09-05 17:16:10 +00:00
Jordan K. Hubbard
94591e176e Cosmetic fixes for drive names which are 4 chars long.
Submitted-By: Joe Greco <jgreco@ns.sol.net>
1996-06-11 16:18:58 +00:00
John Polstra
a49b055f5c Fix a bug in the mbufs display, seen when there was a large number
of mbufs in use.  If the number reached, e.g., 4 digits, then later
decreased to 3 digits, the last digit of the 4-digit number was
not erased.  This caused the display to show a wildly high number of
mbufs in use.
1996-05-27 17:47:09 +00:00