emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merged changes from procps-3.2.8 not present in CVS

Browse Source
This commit is contained in:
Jan Görig 2011-02-10 13:31:14 +01:00
parent 59679bc2a2
commit e47f54c569
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,7 +18,7 @@
VERSION := 3 VERSION := 3
SUBVERSION := 2 SUBVERSION := 2
MINORVERSION := 7 MINORVERSION := 8
TARVERSION := $(VERSION).$(SUBVERSION).$(MINORVERSION) TARVERSION := $(VERSION).$(SUBVERSION).$(MINORVERSION)
############ vars ############ vars

2
procps.spec
View File

@ -3,7 +3,7 @@ Summary: System and process monitoring utilities
Name: procps Name: procps
%define major_version 3 %define major_version 3
%define minor_version 2 %define minor_version 2
%define revision 7 %define revision 8
%define version %{major_version}.%{minor_version}.%{revision} %define version %{major_version}.%{minor_version}.%{revision}
Version: %{version} Version: %{version}
Release: 1 Release: 1

6
ps/output.c
View File

@ -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){ static int pr_class(char *restrict const outbuf, const proc_t *restrict const pp){
switch(pp->sched){ switch(pp->sched){
case -1: return snprintf(outbuf, COLWID, "-"); // not reported 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 1: return snprintf(outbuf, COLWID, "FF"); // SCHED_FIFO
case 2: return snprintf(outbuf, COLWID, "RR"); // SCHED_RR case 2: return snprintf(outbuf, COLWID, "RR"); // SCHED_RR
case 3: return snprintf(outbuf, COLWID, "B"); // SCHED_BATCH case 3: return snprintf(outbuf, COLWID, "B"); // SCHED_BATCH
case 4: return snprintf(outbuf, COLWID, "#4"); // SCHED_ISO? (Con Kolivas) case 4: return snprintf(outbuf, COLWID, "ISO"); // reserved for SCHED_ISO (Con Kolivas)
case 5: return snprintf(outbuf, COLWID, "#5"); // SCHED_IDLEPRIO? (Con Kolivas) case 5: return snprintf(outbuf, COLWID, "IDL"); // SCHED_IDLE
case 6: return snprintf(outbuf, COLWID, "#6"); // case 6: return snprintf(outbuf, COLWID, "#6"); //
case 7: return snprintf(outbuf, COLWID, "#7"); // case 7: return snprintf(outbuf, COLWID, "#7"); //
case 8: return snprintf(outbuf, COLWID, "#8"); // case 8: return snprintf(outbuf, COLWID, "#8"); //

18
ps/ps.1
View File

@ -922,6 +922,10 @@ RR SCHED_RR
.br .br
B SCHED_BATCH B SCHED_BATCH
.br .br
ISO SCHED_ISO
.br
IDL SCHED_IDLE
.br
? unknown value ? unknown value
T} T}
@ -939,6 +943,10 @@ RR SCHED_RR
.br .br
B SCHED_BATCH B SCHED_BATCH
.br .br
ISO SCHED_ISO
.br
IDL SCHED_IDLE
.br
? unknown value ? unknown value
T} T}
@ -1144,6 +1152,10 @@ RR SCHED_RR
.br .br
B SCHED_BATCH B SCHED_BATCH
.br .br
ISO SCHED_ISO
.br
IDL SCHED_IDLE
.br
? unknown value ? unknown value
T} T}
@ -1201,9 +1213,9 @@ information displayed. (alias\ \fBstate\fR).
T} T}
sched SCH T{ sched SCH T{
scheduling policy of the process. The policies sched_other, scheduling policy of the process. The policies SCHED_OTHER (SCHED_NORMAL),
sched_fifo, sched_rr, and sched_batch are respectively SCHED_FIFO, SCHED_RR, SCHED_BATCH, SCHED_ISO, and SCHED_IDLE are respectively
displayed as 0,\ 1,\ 2,\ and\ 3. displayed as 0,\ 1,\ 2,\ 3,\ 4,\ and\ 5.
T} T}
sess SESS T{ sess SESS T{