From e690c43b658805d1464141149ebfad822924947b Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Fri, 16 Feb 2007 12:45:12 +0000 Subject: [PATCH] Document and correctly name fields. Sig now is the pending signals for a process, tsig the pending signals for a lwp. Remove non-existing fields from the documentation. Prodded-by: swildner@ --- bin/ps/keyword.c | 6 +++--- bin/ps/ps.1 | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 3f76eb4a19..38d9dc643c 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -32,7 +32,7 @@ * * @(#)keyword.c 8.5 (Berkeley) 4/2/94 * $FreeBSD: src/bin/ps/keyword.c,v 1.24.2.3 2002/10/10 20:05:32 jmallett Exp $ - * $DragonFly: src/bin/ps/keyword.c,v 1.26 2007/02/03 17:05:57 corecode Exp $ + * $DragonFly: src/bin/ps/keyword.c,v 1.27 2007/02/16 12:45:12 corecode Exp $ */ #include @@ -167,14 +167,13 @@ static const VAR var[] = { {"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN, 0, 0, NULL, NULL}, {"sess", "SESS", NULL, 0, pvar, NULL, 6, POFF(sid), UINT, PIDFMT, NULL}, - {"sig", "PENDING", NULL, 0, lpvar, NULL, 8, LPOFF(siglist), INT, "x", NULL}, + {"sig", "PENDING", NULL, 0, lpvar, NULL, 8, POFF(siglist), INT, "x", NULL}, {"sigcatch", "CAUGHT", NULL, 0, pvar, NULL, 8, POFF(sigcatch), UINT, "x", NULL}, {"sigignore", "IGNORED", NULL, 0, pvar, NULL, 8, POFF(sigignore), UINT, "x", NULL}, {"sigmask", "BLOCKED", NULL, 0, lpvar, NULL, 8, LPOFF(sigmask), UINT, "x", NULL}, - {"sigproc", "PENDING", NULL, 0, pvar, NULL, 8, POFF(siglist), INT, "x", NULL}, {"sl", "SL", NULL, 0, lpvar, NULL, 3, LPOFF(slptime), UINT, "d", NULL}, {"start", "STARTED", NULL, LJUST|USER, started, NULL, 7, 0, 0, NULL, NULL}, {"stat", "", "state", 0, NULL, NULL, 0, 0, 0, NULL, NULL}, @@ -188,6 +187,7 @@ static const VAR var[] = { {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, 0, NULL, NULL}, {"tpgid", "TPGID", NULL, 0, pvar, NULL, 4, POFF(tpgid), UINT, PIDFMT, NULL}, {"tsess", "TSESS", NULL, 0, pvar, NULL, 6, POFF(tsid), UINT, PIDFMT, NULL}, + {"tsig", "PENDING", NULL, 0, pvar, NULL, 8, LPOFF(siglist), INT, "x", NULL}, {"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4, 0, 0, NULL, NULL}, {"tt", "TT ", NULL, 0, tname, NULL, 4, 0, 0, NULL, NULL}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, 0, NULL, NULL}, diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 55ed88e606..bc43dbce51 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -31,7 +31,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD: src/bin/ps/ps.1,v 1.24.2.7 2002/06/20 22:43:33 charnier Exp $ -.\" $DragonFly: src/bin/ps/ps.1,v 1.12 2006/05/28 23:12:09 dillon Exp $ +.\" $DragonFly: src/bin/ps/ps.1,v 1.13 2007/02/16 12:45:12 corecode Exp $ .\" .Dd April 6, 2006 .Dt PS 1 @@ -386,8 +386,8 @@ jail ID job control count .It Cm ktrace tracing flags -.It Cm ktracep -tracing vnode +\" .It Cm ktracep +\" tracing vnode .It Cm lastcpu CPU ID the process was last scheduled on .It Cm lim @@ -441,8 +441,8 @@ scheduling priority (lower == better) core residency time (in seconds; 127 = infinity) .It Cm rgid real group ID -.It Cm rlink -reverse link on run queue, or 0 +\" .It Cm rlink +\" reverse link on run queue, or 0 .It Cm rss resident set size .It Cm rsz @@ -492,6 +492,8 @@ control terminal process group ID .\"text resident set size (in Kbytes) .It Cm tsess control terminal session pointer +.It Cm tsig +pending thread signals .It Cm tsiz text size (in Kbytes) .It Cm tt -- 2.41.0