From 3600f652e83b5b9e084e0a9ffecaeae4115d4fab Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Thu, 18 Jun 2015 00:00:00 -0500 Subject: [PATCH] documentation: fix man pages due to refactor for wchan This patch will bring three of our man pages into line with the recent refactor of the libprocps wchan logic. [ and also eliminates more damn eol whitespace which ] [ snuck in our repo with the commit referenced below ] Reference(s): http://www.freelists.org/post/procps/WCHAN,11 commit cf4788c28dba784a09c8b036a56fffa49da584e7 Signed-off-by: Jim Warner --- proc/openproc.3 | 3 --- ps/ps.1 | 46 ++-------------------------------------------- top/top.1 | 10 ++-------- 3 files changed, 4 insertions(+), 55 deletions(-) diff --git a/proc/openproc.3 b/proc/openproc.3 index 31942ca0..63b921cd 100644 --- a/proc/openproc.3 +++ b/proc/openproc.3 @@ -102,9 +102,6 @@ read information from read information from .IR /proc/#pid/stat .TP 0.5i -.B "PROC_FILLWCHAN" -do WCHAN lookup -.TP 0.5i .B "PROC_FILLARG" equivalent to PROC_FILLCOM .TP 0.5i diff --git a/ps/ps.1 b/ps/ps.1 index 2f03907f..bce55bd9 100644 --- a/ps/ps.1 +++ b/ps/ps.1 @@ -646,41 +646,9 @@ Examples: .BI \-\-lines \ n Set screen height. .TP -.BI \-n \ namelist -Set namelist file. Identical to -.BR N . -The namelist file is needed for a proper WCHAN display, and must match the -current Linux kernel exactly for correct output. Without this option, the -default search path for the namelist is: -.RS 8 -.IP -$PS_SYSMAP -.br -$PS_SYSTEM_MAP -.br -/proc/*/wchan -.br -/boot/System.map\-$(uname\ \-r) -.br -/boot/System.map -.br -/lib/modules/$(uname\ \-r)/System.map -.br -/usr/src/linux/System.map -.br -/System.map -.RE -.TP .B n Numeric output for WCHAN and USER (including all types of UID and GID). .TP -.BI N \ namelist -Specify namelist file. Identical to -.BR \-n , -see -.B \-n -above. -.TP .B \-\-no\-headers Print no header line at all. .B \-\-no\-heading @@ -804,10 +772,6 @@ this .B ps any special permissions. .PP -This -.B ps -needs access to namelist data for proper WCHAN display. For kernels prior to -2.6, the System.map file must be installed. .PP CPU usage is currently expressed as the percentage of time spent running during the entire lifetime of a process. This is not ideal, and\ it does not @@ -826,8 +790,8 @@ will be destroyed by .IR init (8) if the parent process exits. .PP -If the length of the username is greater than the length of the display -column, the username will be truncated. See the -o and -O formatting +If the length of the username is greater than the length of the display +column, the username will be truncated. See the -o and -O formatting options to customize length. .PP Commands options such as @@ -1882,12 +1846,6 @@ and .B DefBSD values are particularly useful. .TP -.B PS_SYSMAP -Default namelist (System.map) location. -.TP -.B PS_SYSTEM_MAP -Default namelist (System.map) location. -.TP .B POSIXLY_CORRECT Don't find excuses to ignore bad "features". .TP diff --git a/top/top.1 b/top/top.1 index d99135b3..d73bc895 100644 --- a/top/top.1 +++ b/top/top.1 @@ -831,16 +831,10 @@ swapped out and pages that have been mapped but not used. .TP 4 38.\fB WCHAN \*(Em Sleeping in Function \fR -Depending on the availability of the kernel link map (System.map), this -field will show the name or the address of the kernel function in which the -task is currently sleeping. +This field will show the name of the kernel function in which the task +is currently sleeping. Running tasks will display a dash (`\-') in this column. -By displaying this field, \*(We's own working set could be increased by over -700Kb, depending on the kernel version. -Should that occur, your only means of reducing that overhead will be to stop -and restart \*(We. - .TP 4 39.\fB nDRT \*(Em Dirty Pages Count \fR The number of pages that have been modified since they were last