From 9049ffef3282b2463a2a3ef1753911ec079d1895 Mon Sep 17 00:00:00 2001 From: albert <> Date: Sun, 10 Sep 2006 06:25:56 +0000 Subject: [PATCH] ps man page --- NEWS | 4 ++++ proc/sysinfo.c | 1 + procps.lsm | 8 ++++---- procps.spec | 2 +- ps/parser.c | 2 +- ps/ps.1 | 15 +++++++++++++-- top.c | 2 +- 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index 4f2b0bcc..e2fb6cf7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +procps-3.2.7 --> procps-3.2.8 + +ps: document SCHED_BATCH and add "see also" for stime + procps-3.2.6 --> procps-3.2.7 top: document H option -- thanks Tony Ernst diff --git a/proc/sysinfo.c b/proc/sysinfo.c index 9a8f843f..e008e967 100644 --- a/proc/sysinfo.c +++ b/proc/sysinfo.c @@ -153,6 +153,7 @@ static void old_Hertz_hack(void){ case 95 ... 105 : Hertz = 100; break; /* normal Linux */ case 124 ... 132 : Hertz = 128; break; /* MIPS, ARM */ case 195 ... 204 : Hertz = 200; break; /* normal << 1 */ + case 247 ... 252 : Hertz = 250; break; case 253 ... 260 : Hertz = 256; break; case 393 ... 408 : Hertz = 400; break; /* normal << 2 */ case 790 ... 808 : Hertz = 800; break; /* normal << 3 */ diff --git a/procps.lsm b/procps.lsm index a065e121..f2b80647 100644 --- a/procps.lsm +++ b/procps.lsm @@ -1,15 +1,15 @@ Begin4 Title: procps -Version: 3.2.6 -Entered-date: 2005-10-30 +Version: 3.2.7 +Entered-date: 2006-06-25 Description: Linux system utilities Keywords: procps /proc libproc sysctl pmap ps uptime tload slabtop free w top vmstat watch skill snice kill pgrep pkill Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc. Maintained-by: various Primary-site: http://procps.sf.net/ - 277kB procps-3.2.6.tar.gz + 281kB procps-3.2.7.tar.gz Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html - 277kB procps-3.2.6.tar.gz + 281kB procps-3.2.7.tar.gz Copying-policy: mixed End diff --git a/procps.spec b/procps.spec index 98d8fce0..61aaed98 100644 --- a/procps.spec +++ b/procps.spec @@ -3,7 +3,7 @@ Summary: System and process monitoring utilities Name: procps %define major_version 3 %define minor_version 2 -%define revision 6 +%define revision 7 %define version %{major_version}.%{minor_version}.%{revision} Version: %{version} Release: 1 diff --git a/ps/parser.c b/ps/parser.c index 06601225..8a6fedb8 100644 --- a/ps/parser.c +++ b/ps/parser.c @@ -231,7 +231,7 @@ static const char *parse_sysv_option(void){ // In the meantime, please do not add to it. The list is // intended to ONLY contain flags defined by the POSIX and UNIX // standards published by The Open Group, IEEE, and ISO. - if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; + if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX switch(*flagptr){ case 'A': diff --git a/ps/ps.1 b/ps/ps.1 index 49c54fb4..1d68aedf 100644 --- a/ps/ps.1 +++ b/ps/ps.1 @@ -884,6 +884,7 @@ time the command started. If the process was started less than 24 hours ago, the output format is "\ HH:MM", else it is "mmm\ dd" (where mmm is the three letters of the month). +See also \fBlstart\fR, \fBstart\fR, \fBstart_time\fR, and \fBstime\fR. T} bsdtime TIME T{ @@ -915,6 +916,8 @@ FF SCHED_FIFO .br RR SCHED_RR .br +B SCHED_BATCH +.br ? unknown value T} @@ -930,6 +933,8 @@ FF SCHED_FIFO .br RR SCHED_RR .br +B SCHED_BATCH +.br ? unknown value T} @@ -1065,6 +1070,7 @@ T} lstart STARTED T{ time the command started. +See also \fBbsdstart\fR, \fBstart\fR, \fBstart_time\fR, and \fBstime\fR. T} lwp LWP T{ @@ -1132,6 +1138,8 @@ FF SCHED_FIFO .br RR SCHED_RR .br +B SCHED_BATCH +.br ? unknown value T} @@ -1189,8 +1197,9 @@ information displayed. (alias\ \fBstate\fR). T} sched SCH T{ -scheduling policy of the process. The policies sched_other, sched_fifo, -and sched_rr are respectively displayed as 0,\ 1,\ and\ 2. +scheduling policy of the process. The policies sched_other, +sched_fifo, sched_rr, and sched_batch are respectively +displayed as 0,\ 1,\ 2,\ and\ 3. T} sess SESS T{ @@ -1255,6 +1264,7 @@ If the process was started less than 24 hours ago, the output format is "HH:MM:SS", else it is "\ \ mmm\ dd" (where mmm is a three\-letter month\ name). +See also \fBlstart\fR, \fBbsdstart\fR, \fBstart_time\fR, and \fBstime\fR. T} start_time START T{ @@ -1263,6 +1273,7 @@ Only the year will be displayed if the process was not started the same year \fBps\fR was invoked, or\ "mmmdd" if\ it was not started the same day, or\ "HH:MM" otherwise. +See also \fBbsdstart\fR, \fBstart\fR, \fBlstart\fR, and \fBstime\fR. T} stat STAT T{ diff --git a/top.c b/top.c index e0ab5990..a71a80a8 100644 --- a/top.c +++ b/top.c @@ -2485,7 +2485,7 @@ static void do_key (unsigned c) switch (c) { case '1': - if (Cpu_tot+7 > Screen_rows && !CHKw(Curwin, View_CPUSUM)) { + if (Cpu_tot+7 > Screen_rows && CHKw(Curwin, View_CPUSUM)) { show_msg(err_num_cpus); break; }