Commit Graph

96 Commits

Author SHA1 Message Date
Robert Watson
a2e59d80d5 Print (total - used) as the amount of available swap for a swap device
when printing swapinfo output, rather than (total), as that is (strictly
speaking) more accurate.

Pointed out by:	Rob <spamrefuse at yahoo dot com>
MFC after:	3 days
2005-11-17 19:31:52 +00:00
Stefan Farfeleder
18b51f792f Remove unused variables. 2005-04-09 14:59:10 +00:00
Giorgos Keramidas
00191f86e0 Use a designator for initializing only one member of the nlist
structs, making pstat WARNS=3 clean on i386, sparc64 and amd64.

Bump WARNS level to 3.

Approved by:	sam, pjd
2005-03-21 18:11:31 +00:00
Giorgos Keramidas
7257230f7b - Add a -h flag to pstat to print swap sizes in "human readable"
format, with humanize_number(3).

- Move the common parts of the code that prints the sizes for a single
  swap device and the total to a single function to avoid repeating
  the humanize_number() stuff all over the place.

- Change the type of CONVERT() from intmax_t to int64_t, since this
  makes calling humanize_number() easier but cast the values to
  intmax_t before printing them, to make use of the %jd format that
  printf() supports.

- Document the new -h flag in the manpage and bump its date.

Approved by:	pjd
Useful tips:	brooks
MFC after:	2 weeks
2005-03-21 16:36:05 +00:00
David Schultz
6004362e66 Don't include sys/user.h merely for its side-effect of recursively
including other headers.
2004-11-27 06:51:39 +00:00
Warner Losh
486c8cc4c6 Per letter dated July 22, 1999 remove 3rd clause of Berkeley derived software
(with permission of addtional copyright holders where appropriate)
2004-08-07 04:28:56 +00:00
Poul-Henning Kamp
203bcaf51e Update kvm mode to match kernel changes. 2004-06-09 12:20:44 +00:00
Ruslan Ermilov
8482be06ec -N without -M is pointless. 2004-03-26 09:28:03 +00:00
Mark Murray
16fc3635f7 Make NULL a (void*)0 whereever possible, and fix the warnings(-Werror)
that this provokes. "Wherever possible" means "In the kernel OR NOT
C++" (implying C).

There are places where (void *) pointers are not valid, such as for
function pointers, but in the special case of (void *)0, agreement
settles on it being OK.

Most of the fixes were NULL where an integer zero was needed; many
of the fixes were NULL where ascii <nul> ('\0') was needed, and a
few were just "other".

Tested on: i386 sparc64
2004-03-05 08:10:19 +00:00
Poul-Henning Kamp
799aba9656 Remove options processing for dumping swapdevice radix map. 2003-07-31 21:20:08 +00:00
Poul-Henning Kamp
46637267ec When dumping swap information, drop the "Type" field which displays
a constant string of little information these days.

This removes the need to #include <vm/swap_pager.h> which is due to
become a kernel only include file.
2003-07-31 20:46:33 +00:00
Poul-Henning Kamp
1afc333e74 Report NODEV devices as <NFSfile> 2003-06-05 21:56:47 +00:00
David E. O'Brien
b728350ee6 Use __FBSDID over rcsid[]. Protect copyright[] where needed. 2003-05-03 21:06:42 +00:00
Robert Drehmel
46f7e0d224 - Modernize the format of the open file showing mode output:
. Print the column headers centered (except for the left-aligned
     TYPE header) using a different header for architectures where
     sizeof(uintptr_t) is not four.
   . Consistently do not print a '0x' prefix for hexadecimal values.
   . Separate columns by a single space character.
   . Pad the columns presenting an address or offset enough to hold
     their respective largest value.
   . Do not restrict the output to unknown file types, inodes and
     sockets; allow displaying of pipes, fifos, kqueues and crypto file
     descriptors too.
 - Shorten an overly long line by removing a cast of printf's return
   value to void.

PR:		alpha/45240
Tested on:	i386, sparc64, alpha
2003-01-31 15:16:52 +00:00
Matthew Dillon
48e3128b34 Bow to the whining masses and change a union back into void *. Retain
removal of unnecessary casts and throw in some minor cleanups to see if
anyone complains, just for the hell of it.
2003-01-13 00:33:17 +00:00
Matthew Dillon
cd72f2180b Change struct file f_data to un_data, a union of the correct struct
pointer types, and remove a huge number of casts from code using it.

Change struct xfile xf_data to xun_data (ABI is still compatible).

If we need to add a #define for f_data and xf_data we can, but I don't
think it will be necessary.  There are no operational changes in this
commit.
2003-01-12 01:37:13 +00:00
Poul-Henning Kamp
42c43e6031 Make struct swblock kernel only, to make vm/swap_pager.h userland includable.
Move struct swdevt from sys/conf.h to the more appropriate vm/swap_pager.h.
Adjust #include use in libkvm and pstat(8) to match.
2003-01-03 16:23:12 +00:00
Mike Barcroft
c48205f332 Back out rev 1.78; getbsize(3)'s original interface has been restored.
Approved by:	markm
2002-12-30 18:19:19 +00:00
Mark Murray
84ee4a7c72 Adjust argument passed to getbsize(). 2002-10-23 18:55:20 +00:00
Dag-Erling Smørgrav
eeebf53e24 Use struct xfile, not struct file. 2002-07-31 12:43:17 +00:00
Dag-Erling Smørgrav
5f9ab4b001 If unable to retrive maxfiles / openfiles, fail rather than print garbage.
Gratuitously rename a couple of variables.
Remove unused macros.
Add NAI copyright.

Sponsored by:	DARPA, NAI Labs
2002-05-28 06:52:21 +00:00
Dag-Erling Smørgrav
182a90e4ec Remove the code that was disabled in a recent commit; it is of very limited
use and has been broken in -CURRENT for a long time.
Clean up unneeded entries in the nlist array.
Implement kvm-backed ttymode (which we never had before).  Incomplete as we
do not (yet?) print the correct device, sid or pgid.

Sponsored by:	DARPA, NAI Labs
2002-05-28 06:37:27 +00:00
Dag-Erling Smørgrav
bf94613dfc Oops, don't print /dev/ twice. 2002-05-28 05:45:56 +00:00
Dag-Erling Smørgrav
333eaaeda9 struct tty -> struct xtty. Reenable some previously disable code, but
temporarily disable some rarely-used code that needs more work.

Sponsored by:	DARPA, NAI Labs
2002-05-28 05:42:32 +00:00
Dag-Erling Smørgrav
4418dbbd1a Un-kmemize. Portions of the tty mode code have been temporarily disabled;
everything else, including dead kernel support, works just like before.

Sponsored by:	DARPA, NAI Labs
2002-05-23 15:09:49 +00:00
Dag-Erling Smørgrav
d88b2458a5 Nits in previous commits.
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:58:07 +00:00
Dag-Erling Smørgrav
0cbfd1a525 Cull large amounts of dead code (deprecated since 1997)
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:53:04 +00:00
Dag-Erling Smørgrav
c9624363a8 ANSIfy.
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:48:25 +00:00
Dag-Erling Smørgrav
1dcc9c32aa Staticize.
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:44:23 +00:00
Dag-Erling Smørgrav
d4a0c7a6b5 Whitespace cleanup.
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:42:17 +00:00
Dag-Erling Smørgrav
09941f75bd Unbreak tty mode (cons was renamed to constty a while ago)
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:41:52 +00:00
Ian Dowse
72d12a7fae Oops, remove references to NLOCKED and NWANTED, now that they no
longer exist.
2002-04-28 10:24:38 +00:00
Matthew Dillon
c72ccd014d Change the vnode list under the mount point from a LIST to a TAILQ
in preparation for an implementation of limiting code for kern.maxvnodes.

MFC after:	3 days
2001-10-23 01:21:29 +00:00
Peter Wemm
9119623471 Userland part of nfs client/server split and cleanup. 2001-09-18 23:34:44 +00:00
Ruslan Ermilov
3b7e5ccc6a SECURITY: Drop `setgid kmem' bit as early as possible. 2001-08-31 16:26:37 +00:00
Thomas Moestl
6ed5918a25 Fix the third argument to sysctlbyname() to be of the type size_t *
(instead of int *).

MFC after:	2 days
2001-07-30 21:42:26 +00:00
Dima Dorfman
a0bdb67e40 Make the '-tn' flag combination print the major/minor numbers of the
line as documented intead of a full column of 0's.
2001-07-04 22:53:19 +00:00
Dima Dorfman
7309915e7a Nuke unused variables. 2001-06-24 23:41:57 +00:00
Dima Dorfman
c01c5d5c46 Don't call printf without a format string (harmless in this case). 2001-06-17 02:01:43 +00:00
Ruslan Ermilov
0b381bf1fd Remove vestiges of MFS. 2001-06-01 10:07:28 +00:00
Ruslan Ermilov
99d300a1ec - FDESC, FIFO, NULL, PORTAL, PROC, UMAP and UNION file
systems were repo-copied from sys/miscfs to sys/fs.

- Renamed the following file systems and their modules:
  fdesc -> fdescfs, portal -> portalfs, union -> unionfs.

- Renamed corresponding kernel options:
  FDESC -> FDESCFS, PORTAL -> PORTALFS, UNION -> UNIONFS.

- Install header files for the above file systems.

- Removed bogus -I${.CURDIR}/../../sys CFLAGS from userland
  Makefiles.
2001-05-23 09:42:29 +00:00
Alfred Perlstein
b56b39ad4d Unbreak world, IN_SHLOCK/IN_EXLOCK haven't existed in a while and
Kirk finally has ditched them.  While I'm here also ditch FSHLOCK.
2001-05-09 03:38:02 +00:00
Greg Lehey
60fb0ce365 Revert consequences of changes to mount.h, part 2.
Requested by:	bde
2001-04-29 02:45:39 +00:00
Greg Lehey
06d71e32d8 Include necessary header files, in preparation for fixing breakage in
sys/mount.h.

Suggested by: phk
2001-04-23 08:13:18 +00:00
Assar Westerlund
26a2d90362 update to the current set of mnt_, ufs_ and nfs_ flags
also make man-page correspond to the code
2000-12-30 15:41:40 +00:00
Poul-Henning Kamp
88f9a60376 Use the MACRO API to <sys/queue.h>.
Submitted by:	"Peter Avalos" <pavalos@theshell.com>
2000-12-30 14:19:07 +00:00
Kris Kennaway
bc488ed1ad Constify 2000-11-27 08:18:58 +00:00
Peter Wemm
9ce6a2e6b5 Don't report TABLDISC - it "doesn't happen(TM)" 2000-01-29 16:45:28 +00:00
Peter Wemm
c447342094 Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL"
is an application space macro and the applications are supposed to be free
to use it as they please (but cannot).  This is consistant with the other
BSD's who made this change quite some time ago.  More commits to come.
1999-12-29 05:07:58 +00:00
Philippe Charnier
73f2a3c2c8 Add extra columns for printing longer device name. 1999-12-05 20:04:56 +00:00