Commit Graph

114 Commits

Author SHA1 Message Date
ed
2a84e78d2e Get rid of major/minor number distinction.
As of FreeBSD 6, devices can only be opened through devfs. These device
nodes don't have major and minor numbers anymore. The st_rdev field in
struct stat is simply based a copy of st_ino.

Simply display device numbers as hexadecimal, using "%#jx". This is
allowed by POSIX, since it explicitly states things like the following
(example taken from ls(1)):

	"If the file is a character special or block special file, the
	size of the file may be replaced with implementation-defined
	information associated with the device in question."

This makes the output of these commands more compact. For example, ls(1)
now uses approximately four columns less. While there, simplify the
column length calculation from ls(1) by calling snprintf() with a NULL
buffer.

Don't be afraid; if needed one can still obtain individual major/minor
numbers using stat(1).
2011-09-28 18:53:36 +00:00
stas
e69f9c07d3 - Avoid overflowing the swap size counters in human-readable mode
by introducing the new CONVERT_BLOCKS macro which operates on
  sizes already converted to number of blocks.  With this macro
  it is not longer needed to perform needless multiplication by
  blocksize just to divide on it later in CONVERT macro.

Approved by:	re (kib)
MFC after:	1 week
2009-08-15 14:39:33 +00:00
stas
6d656f36a9 - Make pstat(8) WARNS=6 safe.
- While here, eliminate the check for len > 0 in ttymode_sysctl
  as the code is able to handle this case well.

Reviewed by:	ed (initial version)
2009-06-11 17:03:28 +00:00
ed
06bce6ca23 Correct my previous commit to pstat(8).
Not only mark the strings inside the array as const, but do the same for
the elements of the array itself.

Submitted by:	Christoph Mallon
2009-06-11 09:59:47 +00:00
ed
3f57ef9c14 Make most of pstat(8) build with WARNS=6.
There is still an issue with the nlists, which I'm not quite sure how to
solve, so I'm leaving WARNS set to 3 right now.
2009-06-11 09:02:22 +00:00
ed
5f2edd80fc Serialize write() calls on TTYs.
Just like the old TTY layer, the current MPSAFE TTY layer does not make
any attempt to serialize calls of write(). Data is copied into the
kernel in 256 (TTY_STACKBUF) byte chunks. If a write() call occurs at
the same time, the data may interleave. This is especially likely when
the TTY starts blocking, because the output queue reaches the high
watermark.

I've implemented this by adding a new flag, TTY_BUSY_OUT, which is used
to mark a TTY as having a thread stuck in write(). Because I don't want
non-blocking processes to be possibly blocked by a sleeping thread, I'm
still allowing it to bypass the protection. According to this message,
the Linux kernel returns EAGAIN in such cases, but I think that's a
little too restrictive:

	http://kerneltrap.org/index.php?q=mailarchive/linux-kernel/2007/5/2/85418/thread

PR:		kern/118287
2009-02-11 16:28:49 +00:00
ed
e085cfc485 Don't leave the console TTY constantly open.
When we leave the console TTY constantly open, we never reset the
termios attributes. This causes output processing, echoing, etc. not to
be reset to the proper values when going into single user mode after the
system has booted. It also causes nl-to-crnl-conversion not to take
place during shutdown, which causes a `staircase effect'.

This patch adds a new TTY flag, TF_OPENED_CONS, which is set when the
TTY is opened through /dev/console. Because the flags are only used by
the kernel and the pstat(8) utility, I've decided to renumber the TTY
flags. This shouldn't be an issue, because the TTY layer is not yet part
of a stable release.

Reported by:	Mark Atkinson <atkin901 yahoo com>
Tested by:	sepotvin
2009-02-05 14:21:09 +00:00
ed
57b4089c20 Clamp the values of t_column to 5 digits in pstat -t' and show all ttys'.
We often run into these very high column numbers when we run curses
applications, because they don't print any newlines. This messes up the
table output of `pstat -t'. If these numbers get really high, they
aren't of any use to the reader anyway. Convert them to `99999' when
they run out of bounds.
2008-11-01 13:40:46 +00:00
ed
1475e942ed Introduce a hooks layer for the MPSAFE TTY layer.
One of the features that prevented us from fixing some of the TTY
consumers to work once again, was an interface that allowed consumers to
do the following:

- `Sniff' incoming data, which is used by the snp(4) driver.

- Take direct control of the input and output paths of a TTY, which is
  used by ng_tty(4), ppp(4), sl(4), etc.

There's no practical advantage in committing a hooks layer without
having any consumers. In P4 there is a preliminary port of snp(4) and
thompsa@ is busy porting ng_tty(4) to this interface. I already want to
have it in the tree, because this may stimulate others to work on the
remaining modules.

Discussed with:	thompsa
Obtained from:	//depot/projects/mpsafetty/...
2008-09-22 19:25:14 +00:00
ed
cc3116a938 Integrate the new MPSAFE TTY layer to the FreeBSD operating system.
The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:

- Improved driver model:

  The old TTY layer has a driver model that is not abstract enough to
  make it friendly to use. A good example is the output path, where the
  device drivers directly access the output buffers. This means that an
  in-kernel PPP implementation must always convert network buffers into
  TTY buffers.

  If a PPP implementation would be built on top of the new TTY layer
  (still needs a hooks layer, though), it would allow the PPP
  implementation to directly hand the data to the TTY driver.

- Improved hotplugging:

  With the old TTY layer, it isn't entirely safe to destroy TTY's from
  the system. This implementation has a two-step destructing design,
  where the driver first abandons the TTY. After all threads have left
  the TTY, the TTY layer calls a routine in the driver, which can be
  used to free resources (unit numbers, etc).

  The pts(4) driver also implements this feature, which means
  posix_openpt() will now return PTY's that are created on the fly.

- Improved performance:

  One of the major improvements is the per-TTY mutex, which is expected
  to improve scalability when compared to the old Giant locking.
  Another change is the unbuffered copying to userspace, which is both
  used on TTY device nodes and PTY masters.

Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.

Obtained from:		//depot/projects/mpsafetty/...
Approved by:		philip (ex-mentor)
Discussed:		on the lists, at BSDCan, at the DevSummit
Sponsored by:		Snow B.V., the Netherlands
dcons(4) fixed by:	kan
2008-08-20 08:31:58 +00:00
ed
27f054a7ef Remove OTTYDISC, NETLDISC and NTTYDISC definitions.
When I ported most applications away from <sgtty.h>, I noticed none of
them were actually using these definitions. I kept them in place,
because I didn't want to touch tools like pstat(8) and stty(1).

In preparation for the MPSAFE TTY layer, remove these definitions. This
doesn't have any impact with respect to binary compatibility (see
tty_conf.c).

We couldn now add an #error to <sys/ioctl_compat.h> when included
outside the kernel. Unfortunately, kdump's mkioctls includes this file
unconditionally.

Approved by:	philip (mentor)
2008-07-16 11:20:04 +00:00
remko
6b54f6342e Fix pstat behaviour when using coredumps. The reference to tp was
incorrect and should have been poining to &tty, tp is a virtual
address from the coredump, while we should obtain the address through
the tty struct.

Approved by:	imp (mentor, implicit trivial changes)
MFC after:	1 week
Submitted by:	Ed Schouten (ed at 80836 dot nl)
2008-05-14 00:22:57 +00:00
scf
196b6346ba Significantly reduce the memory leak as noted in BUGS section for
setenv(3) by tracking the size of the memory allocated instead of using
strlen() on the current value.

Convert all calls to POSIX from historic BSD API:
 - unsetenv returns an int.
 - putenv takes a char * instead of const char *.
 - putenv no longer makes a copy of the input string.
 - errno is set appropriately for POSIX.  Exceptions involve bad environ
   variable and internal initialization code.  These both set errno to
   EFAULT.

Several patches to base utilities to handle the POSIX changes from
Andrey Chernov's previous commit.  A few I re-wrote to use setenv()
instead of putenv().

New regression module for tools/regression/environ to test these
functions.  It also can be used to test the performance.

Bump __FreeBSD_version to 700050 due to API change.

PR:		kern/99826
Approved by:	wes
Approved by:	re (kensmith)
2007-07-04 00:00:41 +00:00
ache
6ccaf050cc Back out all POSIXified *env() changes.
Not because I admit they are technically wrong and not because of bug
reports (I receive nothing). But because I surprisingly meets so
strong opposition and resistance so lost any desire to continue that.

Anyone who interested in POSIX can dig out what changes and how
through cvs diffs.
2007-05-01 16:02:44 +00:00
ache
ebe0ac8fd2 Preparing for upcoming POSIXed putenv() rewrite:
don't allow const as putenv() arg, dup it
2007-04-30 15:16:19 +00:00
ru
4d9aa21f99 - Recognize -g and -m in pstat(8) too.
- Document -g and -m support in swapinfo(8).

Reviewed by:	markm
2007-04-03 08:16:06 +00:00
markm
86444ce085 Add -m (megabytes) and -g (gigabytes) options. I'm tired of being told
I can't do this.

MFC: 1 month
2007-04-01 20:28:37 +00:00
jhb
2b4ab1557b Another crashdump fix: nfiles was renamed to openfiles in 5.x.
MFC after:	3 days
2007-02-14 04:20:41 +00:00
rwatson
f6aff4df9f 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
stefanf
ce3085bbfb Remove unused variables. 2005-04-09 14:59:10 +00:00
keramida
29e024a36a 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
keramida
87827d7ae6 - 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
das
130bed6547 Don't include sys/user.h merely for its side-effect of recursively
including other headers.
2004-11-27 06:51:39 +00:00
imp
9fbed704d5 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
phk
8641ff9ae2 Update kvm mode to match kernel changes. 2004-06-09 12:20:44 +00:00
ru
f4968f78df -N without -M is pointless. 2004-03-26 09:28:03 +00:00
markm
0b0ae8e16e 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
phk
7059dc3883 Remove options processing for dumping swapdevice radix map. 2003-07-31 21:20:08 +00:00
phk
9d4e12540e 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
phk
6a770c47d4 Report NODEV devices as <NFSfile> 2003-06-05 21:56:47 +00:00
obrien
7293a24a2b Use __FBSDID over rcsid[]. Protect copyright[] where needed. 2003-05-03 21:06:42 +00:00
robert
4a93c6295e - 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
dillon
ccd5574cc6 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
dillon
ddf9ef103e 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
phk
b884c995db 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
b6add043f9 Back out rev 1.78; getbsize(3)'s original interface has been restored.
Approved by:	markm
2002-12-30 18:19:19 +00:00
markm
a3db15f196 Adjust argument passed to getbsize(). 2002-10-23 18:55:20 +00:00
des
81f45956da Use struct xfile, not struct file. 2002-07-31 12:43:17 +00:00
des
db56aa68a1 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
des
de2d13be74 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
des
671edd16d9 Oops, don't print /dev/ twice. 2002-05-28 05:45:56 +00:00
des
e60971dda8 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
des
df83130b9c 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
des
530e4f719b Nits in previous commits.
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:58:07 +00:00
des
4cbec75e55 Cull large amounts of dead code (deprecated since 1997)
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:53:04 +00:00
des
041a682317 ANSIfy.
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:48:25 +00:00
des
1fc7e0f0ed Staticize.
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:44:23 +00:00
des
dbc631f550 Whitespace cleanup.
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:42:17 +00:00
des
ab841e31f2 Unbreak tty mode (cons was renamed to constty a while ago)
Sponsored by:	DARPA, NAI Labs
2002-05-23 14:41:52 +00:00
iedowse
3bdd57c657 Oops, remove references to NLOCKED and NWANTED, now that they no
longer exist.
2002-04-28 10:24:38 +00:00