Merged changes from procps-3.2.8 not present in CVS

diff --git a/Makefile b/Makefile
index 0a5ad660e8760808be0f4e87b4d2fe44831c8164..e453453ca18388e7782b21dcd70af4504c3ce9ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 
 VERSION      := 3
 SUBVERSION   := 2
-MINORVERSION := 7
+MINORVERSION := 8
 TARVERSION   := $(VERSION).$(SUBVERSION).$(MINORVERSION)
 
 ############ vars

diff --git a/procps.spec b/procps.spec
index 61aaed981818c751903890e61d048083d519bb58..5ac1be94e8420a837c0abb306431bdc5a4973bff 100644 (file)
--- 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 7
+%define revision 8
 %define version %{major_version}.%{minor_version}.%{revision}
 Version: %{version}
 Release: 1

diff --git a/ps/output.c b/ps/output.c
index 6a79e45217c1c938a59609bc3a2b6a3b4b05b192..8fbc488ef55813a2c43ef983176e9e06ad0410ca 100644 (file)
--- a/ps/output.c
+++ b/ps/output.c
@@ -641,12 +641,12 @@ static int pr_nice(char *restrict const outbuf, const proc_t *restrict const pp)
 static int pr_class(char *restrict const outbuf, const proc_t *restrict const pp){
   switch(pp->sched){
   case -1: return snprintf(outbuf, COLWID, "-");   // not reported
-  case  0: return snprintf(outbuf, COLWID, "TS");  // SCHED_OTHER
+  case  0: return snprintf(outbuf, COLWID, "TS");  // SCHED_OTHER SCHED_NORMAL
   case  1: return snprintf(outbuf, COLWID, "FF");  // SCHED_FIFO
   case  2: return snprintf(outbuf, COLWID, "RR");  // SCHED_RR
   case  3: return snprintf(outbuf, COLWID, "B");   // SCHED_BATCH
-  case  4: return snprintf(outbuf, COLWID, "#4");  // SCHED_ISO? (Con Kolivas)
-  case  5: return snprintf(outbuf, COLWID, "#5");  // SCHED_IDLEPRIO? (Con Kolivas)
+  case  4: return snprintf(outbuf, COLWID, "ISO"); // reserved for SCHED_ISO (Con Kolivas)
+  case  5: return snprintf(outbuf, COLWID, "IDL"); // SCHED_IDLE
   case  6: return snprintf(outbuf, COLWID, "#6");  //
   case  7: return snprintf(outbuf, COLWID, "#7");  //
   case  8: return snprintf(outbuf, COLWID, "#8");  //

diff --git a/ps/ps.1 b/ps/ps.1
index 715fb0897d0db078e2c164974c8c0e8f128cf8d2..7076b325428ca5591f56c65dbf4b38b4d1e894cc 100644 (file)
--- a/ps/ps.1
+++ b/ps/ps.1
@@ -922,6 +922,10 @@ RR SCHED_RR
 .br
 B      SCHED_BATCH
 .br
+ISO    SCHED_ISO
+.br
+IDL    SCHED_IDLE
+.br
 ?      unknown value
 T}
 
@@ -939,6 +943,10 @@ RR SCHED_RR
 .br
 B      SCHED_BATCH
 .br
+ISO    SCHED_ISO
+.br
+IDL    SCHED_IDLE
+.br
 ?      unknown value
 T}
 
@@ -1144,6 +1152,10 @@ RR       SCHED_RR
 .br
 B      SCHED_BATCH
 .br
+ISO    SCHED_ISO
+.br
+IDL    SCHED_IDLE
+.br
 ?      unknown value
 T}
 
@@ -1201,9 +1213,9 @@ information displayed.  (alias\ \fBstate\fR).
 T}
 
 sched  SCH     T{
-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.
+scheduling policy of the process.  The policies SCHED_OTHER (SCHED_NORMAL),
+SCHED_FIFO, SCHED_RR, SCHED_BATCH, SCHED_ISO, and SCHED_IDLE are respectively
+displayed as 0,\ 1,\ 2,\ 3,\ 4,\ and\ 5.
 T}
 
 sess   SESS    T{