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

ps,top: convert 'PIDS_PROCESSOR' into a signed integer

Browse Source 
Not only does that library tweak help to simplify some
top code, but now that ps snprintf fmtstr will finally
be accurate. That is two birdies with a single pebble!

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2021-12-14 00:00:00 -06:00 committed by Craig Small
parent aeb35b18da
commit 957b74292f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ps/output.c
View File

@ -1013,7 +1013,7 @@ setREL1(RSS_RLIM)
/* should print leading tilde ('~') if process is bound to the CPU */ /* should print leading tilde ('~') if process is bound to the CPU */
static int pr_psr(char *restrict const outbuf, const proc_t *restrict const pp){ static int pr_psr(char *restrict const outbuf, const proc_t *restrict const pp){
setREL1(PROCESSOR) setREL1(PROCESSOR)
return snprintf(outbuf, COLWID, "%d", rSv(PROCESSOR, u_int, pp)); return snprintf(outbuf, COLWID, "%d", rSv(PROCESSOR, s_int, pp));
} }
static int pr_pss(char *restrict const outbuf, const proc_t *restrict const pp){ static int pr_pss(char *restrict const outbuf, const proc_t *restrict const pp){

7
top/top.c
View File

@ -1703,7 +1703,7 @@ static struct {
{ 3, -1, A_right, PIDS_PRIORITY }, // s_int EU_PRI { 3, -1, A_right, PIDS_PRIORITY }, // s_int EU_PRI
{ 3, -1, A_right, PIDS_NICE }, // s_int EU_NCE { 3, -1, A_right, PIDS_NICE }, // s_int EU_NCE
{ 3, -1, A_right, PIDS_NLWP }, // s_int EU_THD { 3, -1, A_right, PIDS_NLWP }, // s_int EU_THD
{ 0, -1, A_right, PIDS_PROCESSOR }, // u_int EU_CPN { 0, -1, A_right, PIDS_PROCESSOR }, // s_int EU_CPN
{ 5, -1, A_right, PIDS_TICS_ALL_DELTA }, // u_int EU_CPU { 5, -1, A_right, PIDS_TICS_ALL_DELTA }, // u_int EU_CPU
{ 6, -1, A_right, PIDS_TICS_ALL }, // ull_int EU_TME { 6, -1, A_right, PIDS_TICS_ALL }, // ull_int EU_TME
{ 9, -1, A_right, PIDS_TICS_ALL }, // ull_int EU_TM2 { 9, -1, A_right, PIDS_TICS_ALL }, // ull_int EU_TM2
@ -6029,6 +6029,7 @@ static const char *task_show (const WIN_t *q, int idx) {
break; break;
/* s_int, make_num without auto width */ /* s_int, make_num without auto width */
case EU_AGI: // PIDS_AUTOGRP_ID case EU_AGI: // PIDS_AUTOGRP_ID
case EU_CPN: // PIDS_PROCESSOR
case EU_NMA: // PIDS_PROCESSOR_NODE case EU_NMA: // PIDS_PROCESSOR_NODE
case EU_PGD: // PIDS_ID_PGRP case EU_PGD: // PIDS_ID_PGRP
case EU_PID: // PIDS_ID_PID case EU_PID: // PIDS_ID_PID
@ -6081,10 +6082,6 @@ static const char *task_show (const WIN_t *q, int idx) {
cp = scale_pcnt(u, W, Jn); cp = scale_pcnt(u, W, Jn);
} }
break; break;
/* u_int, make_num without auto width */
case EU_CPN: // PIDS_PROCESSOR
cp = make_num(rSv(EU_CPN, u_int), W, Jn, AUTOX_NO, 0);
break;
/* u_int, make_num with auto width */ /* u_int, make_num with auto width */
case EU_GID: // PIDS_ID_EGID case EU_GID: // PIDS_ID_EGID
case EU_UED: // PIDS_ID_EUID case EU_UED: // PIDS_ID_EUID