Commit 3afaccc3 authored by Craig Small's avatar Craig Small

Merge branch 'master' into 'master'

ps: recognize SCHED_DEADLINE

See merge request !31
parents c6407ef1 f8ccf312
......@@ -4592,6 +4592,9 @@ msgstr "Le programme B<watch> a été écrit par Tony Rems E<lt>I<rembo@unisoft.
#~ msgid "IDL\tSCHED_IDLE\n"
#~ msgstr "IDL\tSCHED_IDLE\n"
#~ msgid "DLN\tSCHED_DEADLINE\n"
#~ msgstr "DLN\tSCHED_DEADLINE\n"
#~ msgid "?\tunknown value\n"
#~ msgstr "?\tvaleur inconnue\n"
......@@ -5199,11 +5202,11 @@ msgstr "Le programme B<watch> a été écrit par Tony Rems E<lt>I<rembo@unisoft.
#~ msgid "scheduling policy of the process. The policies SCHED_OTHER (SCHED_NORMAL),\n"
#~ msgstr "Ordonnancement de la politique du processus. Les politiques SCHED_OTHER (SCHED_NORMAL),\n"
#~ msgid "SCHED_FIFO, SCHED_RR, SCHED_BATCH, SCHED_ISO, and SCHED_IDLE are respectively\n"
#~ msgstr "SCHED_FIFO, SCHED_RR, SCHED_BATCH, SCHED_ISO et SCHED_IDLE sont respectivement\n"
#~ msgid "SCHED_FIFO, SCHED_RR, SCHED_BATCH, SCHED_ISO, SCHED_IDLE and SCHED_DEADLINE are respectively\n"
#~ msgstr "SCHED_FIFO, SCHED_RR, SCHED_BATCH, SCHED_ISO, SCHED_IDLE et SCHED_DEADLINE sont respectivement\n"
#~ msgid "displayed as 0, 1, 2, 3, 4, and 5.\n"
#~ msgstr "affichées comme 0, 1, 2, 3, 4 et 5.\n"
#~ msgid "displayed as 0, 1, 2, 3, 4, 5 and 6.\n"
#~ msgstr "affichées comme 0, 1, 2, 3, 4, 5 et 6.\n"
#~ msgid "seat\tSEAT\tT{\n"
#~ msgstr "seat\tSEAT\tT{\n"
......
......@@ -694,7 +694,7 @@ static int pr_class(char *restrict const outbuf, const proc_t *restrict const pp
case 3: return snprintf(outbuf, COLWID, "B"); // SCHED_BATCH
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 6: return snprintf(outbuf, COLWID, "DLN"); // SCHED_DEADLINE
case 7: return snprintf(outbuf, COLWID, "#7"); //
case 8: return snprintf(outbuf, COLWID, "#8"); //
case 9: return snprintf(outbuf, COLWID, "#9"); //
......
......@@ -1107,6 +1107,8 @@ ISO SCHED_ISO
.br
IDL SCHED_IDLE
.br
DLN SCHED_DEADLINE
.br
? unknown value
T}
......@@ -1129,6 +1131,8 @@ ISO SCHED_ISO
.br
IDL SCHED_IDLE
.br
DLN SCHED_DEADLINE
.br
? unknown value
T}
......@@ -1455,6 +1459,8 @@ ISO SCHED_ISO
.br
IDL SCHED_IDLE
.br
DLN SCHED_DEADLINE
.br
? unknown value
T}
......@@ -1523,8 +1529,8 @@ T}
sched SCH T{
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.
SCHED_FIFO, SCHED_RR, SCHED_BATCH, SCHED_ISO, SCHED_IDLE and SCHED_DEADLINE are
respectively displayed as 0, 1, 2, 3, 4, 5 and 6.
T}
seat SEAT T{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment