From faf5dd873e0967fea57d297b7a3e07b3dcc085e1 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 23 Jan 2018 22:48:06 +0000
Subject: [PATCH] Remove some KSE references from ps(1).

- Simplify the description of -H to assume 1:1 threading.
- Drop 'process' from description of 'lwp' field and the corresponding
  XO field name.
- Do add an expansion of LWP in the description of 'lwp' and 'nlwps'.
- Add 'tid' as an alias for the 'lwp' field.

Reviewed by:	imp, kib (older version)
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D14021
---
 bin/ps/keyword.c |  3 ++-
 bin/ps/ps.1      | 14 +++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index c9d4427ad53d..6842ad9e3a7b 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -122,7 +122,7 @@ static VAR var[] = {
 	{"logname", "", "login", NULL, 0, NULL, 0, CHAR, NULL, 0},
 	{"lstart", "STARTED", NULL, "start-time", LJUST|USER, lstarted, 0,
 	    CHAR, NULL, 0},
-	{"lwp", "LWP", NULL, "process-thread-id", 0, kvar, KOFF(ki_tid), UINT,
+	{"lwp", "LWP", NULL, "thread-id", 0, kvar, KOFF(ki_tid), UINT,
 	    LWPFMT, 0},
 	{"majflt", "MAJFLT", NULL, "major-faults", USER, rvar, ROFF(ru_majflt),
 	    LONG, "ld", 0},
@@ -204,6 +204,7 @@ static VAR var[] = {
 	{"tdnam", "", "tdname", NULL, 0, NULL, 0, CHAR, NULL, 0},
 	{"tdname", "TDNAME", NULL, "thread-name", LJUST, tdnam, 0, CHAR,
 	    NULL, 0},
+	{"tid", "", "lwp", NULL, 0, NULL, 0, CHAR, NULL, 0},
 	{"time", "TIME", NULL, "cpu-time", USER, cputime, 0, CHAR, NULL, 0},
 	{"tpgid", "TPGID", NULL, "terminal-process-gid", 0, kvar,
 	    KOFF(ki_tpgid), UINT, PIDFMT, 0},
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index deb22f63ad4d..c4e22369ece6 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd December 1, 2017
+.Dd January 23, 2018
 .Dt PS 1
 .Os
 .Sh NAME
@@ -148,12 +148,7 @@ This option is honored only if the UID of the user is 0.
 Display information about processes which are running with the specified
 real group IDs.
 .It Fl H
-Show all of the
-.Em kernel visible
-threads associated with each process.
-Depending on the threading package that
-is in use, this may show only the process, only the kernel scheduled entities,
-or all of the process threads.
+Show all of the threads associated with each process.
 .It Fl h
 Repeat the information header as often as necessary to guarantee one
 header per page of information.
@@ -588,7 +583,8 @@ login name of user who started the session
 .It Cm lstart
 time started
 .It Cm lwp
-process thread-id
+thread (light-weight process) ID (alias
+.Cm tid )
 .It Cm majflt
 total page faults
 .It Cm minflt
@@ -605,7 +601,7 @@ nice value (alias
 .It Cm nivcsw
 total involuntary context switches
 .It Cm nlwp
-number of threads tied to a process
+number of threads (light-weight processes) tied to a process
 .It Cm nsigs
 total signals taken (alias
 .Cm nsignals )