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

top: and for symmetry 'UTILIZATION_C' is newest column

Browse Source 
This commit just compliments a change referenced below
by providing the value which includes reaped children.

Reference(s):
. Feb, 2022 - added %CUU field
commit 7647e96b0a

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2022-03-06 00:00:00 -06:00 committed by Craig Small
parent 813661c299
commit cfa5538832
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
top/top.c
View File

@ -1855,9 +1855,10 @@ static struct {
{ 5, -1, A_right, PIDS_AUTOGRP_ID }, // s_int EU_AGI { 5, -1, A_right, PIDS_AUTOGRP_ID }, // s_int EU_AGI
{ 4, -1, A_right, PIDS_AUTOGRP_NICE }, // s_int EU_AGN { 4, -1, A_right, PIDS_AUTOGRP_NICE }, // s_int EU_AGN
{ 7, -1, A_right, PIDS_TICS_BEGAN }, // ull_int EU_TM3 { 7, -1, A_right, PIDS_TICS_BEGAN }, // ull_int EU_TM3
{ 7, -1, A_right, PIDS_TIME_ELAPSED }, // real EU_TM4
{ 6, -1, A_right, PIDS_UTILIZATION }, // real EU_CUU { 6, -1, A_right, PIDS_UTILIZATION }, // real EU_CUU
{ 7, -1, A_right, PIDS_TIME_ELAPSED } // real EU_TM4 { 6, -1, A_right, PIDS_UTILIZATION_C } // real EU_CUC
#define eu_LAST EU_TM4 #define eu_LAST EU_CUC
// xtra Fieldstab 'pseudo pflag' entries for the newlib interface . . . . . . . // xtra Fieldstab 'pseudo pflag' entries for the newlib interface . . . . . . .
#define eu_CMDLINE eu_LAST +1 #define eu_CMDLINE eu_LAST +1
#define eu_TICS_ALL_C eu_LAST +2 #define eu_TICS_ALL_C eu_LAST +2
@ -6264,11 +6265,12 @@ static const char *task_show (const WIN_t *q, int idx) {
break; break;
/* ull_int, scale_pcnt for 'utilization' */ /* ull_int, scale_pcnt for 'utilization' */
case EU_CUU: // PIDS_UTILIZATION case EU_CUU: // PIDS_UTILIZATION
case EU_CUC: // PIDS_UTILIZATION_C
if (Restrict_some) { if (Restrict_some) {
cp = justify_pad("?", W, Jn); cp = justify_pad("?", W, Jn);
break; break;
} }
cp = scale_pcnt(rSv(EU_CUU, real), W, Jn, 1); cp = scale_pcnt(rSv(i, real), W, Jn, 1);
break; 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

2
top/top.h
View File

@ -205,7 +205,7 @@ enum pflag {
EU_RSS, EU_PSS, EU_PZA, EU_PZF, EU_PZS, EU_USS, EU_RSS, EU_PSS, EU_PZA, EU_PZF, EU_PZS, EU_USS,
EU_IRB, EU_IRO, EU_IWB, EU_IWO, EU_IRB, EU_IRO, EU_IWB, EU_IWO,
EU_AGI, EU_AGN, EU_AGI, EU_AGN,
EU_TM3, EU_CUU, EU_TM4, EU_TM3, EU_TM4, EU_CUU, EU_CUC,
#ifdef USE_X_COLHDR #ifdef USE_X_COLHDR
// not really pflags, used with tbl indexing // not really pflags, used with tbl indexing
EU_MAXPFLGS EU_MAXPFLGS

9
top/top_nls.c
View File

@ -353,12 +353,15 @@ static void build_two_nlstabs (void) {
/* Translation Hint: maximum 'STARTED' = 7 */ /* Translation Hint: maximum 'STARTED' = 7 */
Head_nlstab[EU_TM3] = _("STARTED"); Head_nlstab[EU_TM3] = _("STARTED");
Desc_nlstab[EU_TM3] = _("Start Time from boot"); Desc_nlstab[EU_TM3] = _("Start Time from boot");
/* Translation Hint: maximum '%CUU' = 6 */
Head_nlstab[EU_CUU] = _("%CUU");
Desc_nlstab[EU_CUU] = _("CPU Utilization");
/* Translation Hint: maximum 'ELAPSED' = 7 */ /* Translation Hint: maximum 'ELAPSED' = 7 */
Head_nlstab[EU_TM4] = _("ELAPSED"); Head_nlstab[EU_TM4] = _("ELAPSED");
Desc_nlstab[EU_TM4] = _("Elapsed Running Time"); Desc_nlstab[EU_TM4] = _("Elapsed Running Time");
/* Translation Hint: maximum '%CUU' = 6 */
Head_nlstab[EU_CUU] = _("%CUU");
Desc_nlstab[EU_CUU] = _("CPU Utilization");
/* Translation Hint: maximum '%CUC' = 6 */
Head_nlstab[EU_CUC] = _("%CUC");
Desc_nlstab[EU_CUC] = _("Utilization + child");
} }