diff options
| author | Jan Görig <jgorig@redhat.com> | 2011-02-10 13:31:14 +0100 |
|---|---|---|
| committer | Jan Görig <jgorig@redhat.com> | 2011-02-10 13:40:29 +0100 |
| commit | e47f54c569a6985d6d74c1087574ad0298281ec3 (patch) | |
| tree | cddae337c3e853552426420f912ad1c07416d391 | |
| parent | 59679bc2a27438993e33bd3711938ce02e8e569d (diff) | |
| download | procps-ng-e47f54c569a6985d6d74c1087574ad0298281ec3.tar.gz | |
Merged changes from procps-3.2.8 not present in CVS
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | procps.spec | 2 | ||||
| -rw-r--r-- | ps/output.c | 6 | ||||
| -rw-r--r-- | ps/ps.1 | 18 |
4 files changed, 20 insertions, 8 deletions
@@ -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 61aaed9..5ac1be9 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 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 6a79e45..8fbc488 100644 --- 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"); // @@ -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{ |