svn commit: r222949 - in stable/7: contrib/top usr.bin/top

[John Baldwin]

Author: jhb
Date: Fri Jun 10 19:16:50 2011
New Revision: 222949
URL: http://svn.freebsd.org/changeset/base/222949

Log:
  MFC 222532:
  - Document the -H option and 'H' key alongside other options and keys
    rather than at the bottom of the manpage.
  - Remove an obsolete comment about SWAIT being a stale state.  It was
    resurrected for a different purpose in FreeBSD 5 to mark idle ithreads.
  - Add a comment documenting that the SLEEP and LOCK states typically
    display the name of the event being waited on with lock names being
    prefixed with an asterisk and sleep event names not having a prefix.

Modified:
  stable/7/contrib/top/top.X
  stable/7/usr.bin/top/top.local.1
Directory Properties:
  stable/7/contrib/top/   (props changed)
  stable/7/usr.bin/top/   (props changed)

Modified: stable/7/contrib/top/top.X
==============================================================================
--- stable/7/contrib/top/top.X	Fri Jun 10 19:16:26 2011	(r222948)
+++ stable/7/contrib/top/top.X	Fri Jun 10 19:16:50 2011	(r222949)
@@ -89,6 +89,10 @@ Use \*(lqbatch\*(rq mode.  In this mode,
 ignored.  Interrupt characters (such as ^C and ^\e) still have an effect.
 This is the default on a dumb terminal, or when the output is not a terminal.
 .TP
+.B \-H
+Display each thread for a multithreaded process individually.
+By default a single summary line is displayed for each process.
+.TP
 .B \-i
 Use \*(lqinteractive\*(rq mode.  In this mode, any input is immediately
 read for processing.  See the section on \*(lqInteractive Mode\*(rq
@@ -289,6 +293,9 @@ or
 .BR r enice
 command.
 .TP
+.B H
+Toggle the display of threads.
+.TP
 .B i
 (or
 .BR I )
@@ -352,8 +359,11 @@ the order of the processes, and
 COMMAND is the name of the command that the process is currently running
 (if the process is swapped out, this column is marked \*(lq<swapped>\*(rq).
 .SH NOTES
-The \*(lqABANDONED\*(rq state (known in the kernel as \*(lqSWAIT\*(rq) was
-abandoned, thus the name.  A process should never end up in this state.
+If a process is in the \*(lqSLEEP\*(rq or \*(lqLOCK\*(rq state,
+the state column will report the name of the event or lock on which the
+process is waiting.
+Lock names are prefixed with an asterisk \*(lq*\*(rq while sleep events
+are not.
 .SH AUTHOR
 William LeFebvre, EECS Department, Northwestern University
 .SH ENVIRONMENT

Modified: stable/7/usr.bin/top/top.local.1
==============================================================================
--- stable/7/usr.bin/top/top.local.1	Fri Jun 10 19:16:26 2011	(r222948)
+++ stable/7/usr.bin/top/top.local.1	Fri Jun 10 19:16:50 2011	(r222949)
@@ -1,10 +1,6 @@
 .\" $FreeBSD$ 
 .SH "FreeBSD NOTES"
 
-.SH DISPLAY OF THREADS
-The '-H' option will toggle the display of kernel visible thread contexts.
-At runtime the 'H' key will toggle this mode. The default is OFF.
-
 .SH DESCRIPTION OF MEMORY
 Mem: 9220K Active, 1M Inact, 3284K Wired, 1M Cache, 2M Buf, 1320K Free
 Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104K Out