diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-01-07 05:38:13 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2012-01-07 05:38:13 +0000 |
| commit | 9c22654341479292c2a155db5eff66302470f976 (patch) | |
| tree | 63408cc0f48f4f1d3e63b5d6a2aafd56590dc9c6 /bin/ps | |
| parent | a279f2f3d85c99cdfafe036c75959e20e475e29d (diff) | |
Add rtable id and thread id to struct kinfo_proc (and fix process id)
and add an 'rtableid' keyword to ps.
Add rtable id, thread id, and socket splice info to struct kinfo_file2
and make fstat display socket splice information.
Remove old KVM_PROC2 and kinfo_proc2 interfaces; bump libkvm major
Socket splice info and corrections from bluhm@ "Lovely" deraadt@
Diffstat (limited to 'bin/ps')
| -rw-r--r-- | bin/ps/keyword.c | 3 | ||||
| -rw-r--r-- | bin/ps/ps.1 | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 9a6457b6772..df81cdf948b 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.34 2011/12/29 17:13:55 guenther Exp $ */ +/* $OpenBSD: keyword.c,v 1.35 2012/01/07 05:38:12 guenther Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -146,6 +146,7 @@ VAR var[] = { {"rss", "RSS", NULL, 0, p_rssize, 5}, {"rssize", "", "rsz"}, {"rsz", "RSZ", NULL, 0, rssize, 4}, + {"rtable", "RTABLE", NULL, 0, pvar, 0, 0, POFF(p_rtableid), INT32, "d"}, UID("ruid", "RUID", pvar, POFF(p_ruid)), {"ruser", "RUSER", NULL, LJUST, runame, USERLEN}, {"sess", "SESS", NULL, 0, pvar, PTRWIDTH, 0, POFF(p_sess), UINT64, "llx"}, diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index f26b16649e8..c16a15e3b44 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ps.1,v 1.80 2011/12/16 17:13:18 jmc Exp $ +.\" $OpenBSD: ps.1,v 1.81 2012/01/07 05:38:12 guenther Exp $ .\" $NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 @@ -30,7 +30,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: December 16 2011 $ +.Dd $Mdocdate: January 7 2012 $ .Dt PS 1 .Os .Sh NAME @@ -338,6 +338,8 @@ The real memory (resident set) size of the process (in 1024 byte units). Alias: .Cm rssize . Resident set size + (text size / text use count). +.It Cm rtable +Routing table. .It Cm ruid Real user ID. .It Cm ruser |