From 89db82d143d005dcc0b8af1bc1f3b1204c88730a Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Fri, 10 Mar 2017 00:00:00 -0600 Subject: [PATCH] top: provide -1 command line switch as 'Cpu(s)' toggle If built without ./configure --disable-modern-top, the program displays each cpu individually providing there is sufficient vertical screen real estate. For massive SMP environments this will necessitate use of a config file where the cpu summary toggle ('1') could be saved via the 'W' command. But, an rcfile may not be viable. So this commit introduces a '1' command line switch to emulate exactly the effects of the interactive toggle. And since it is our first numeric switch some existing parsing logic had to be changed slightly. Such changes are, in truth, an improvement. For example, instead of seeing "inappropriate '2'" with ./top -2 we'll now see the vastly more appropriate error "unknown option '2'. References(s): https://gitlab.com/procps-ng/procps/issues/55 Signed-off-by: Jim Warner --- NEWS | 1 + top/top.1 | 13 +++++++++++-- top/top.c | 12 +++++++++--- top/top_nls.c | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 64b75cf2..684379c4 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,7 @@ procps-ng-NEXT * kill: -l space between name parses correctly Debian #854407 * top: show fewer memory decimal places (configurable) * top: provide command line switch for memory scaling + * top: provide command line switch for CPU States procps-ng-3.3.12 ---------------- diff --git a/top/top.1 b/top/top.1 index b468748b..10251a96 100644 --- a/top/top.1 +++ b/top/top.1 @@ -32,7 +32,7 @@ .ds CI interactive command \# - Note: our 'Command Line' used in 2 places \# ( and managed to fit in an 80x24 terminal ) -.ds CL \-\fBhv\fR|\-\fBbcEHiOSs\fR \-\fBd\fR secs \-\fBn\fR max \ +.ds CL \-\fBhv\fR|\-\fBbcEHiOSs1\fR \-\fBd\fR secs \-\fBn\fR max \ \-\fBu\fR|\fBU\fR user \-\fBp\fR pid \-\fBo\fR fld \-\fBw\fR [cols] \fR .ds CO command\-line option .ds CT command toggle @@ -252,7 +252,7 @@ All are explained in detail in the sections that follow. l \- Load Avg/Uptime On (thus program name) t \- Task/Cpu states On (1+1 lines, see `1') m \- Mem/Swap usage On (2 lines worth) - 1 \- Single Cpu Off (thus multiple cpus) + * 1 \- Single Cpu Off (thus multiple cpus) \fITask-Area-defaults\fR b \- Bold hilite Off (use `reverse') * c \- Command line Off (name, not cmdline) @@ -486,6 +486,15 @@ in Batch mode actual terminal dimensions can never be exceeded. \*(NT Without the use of this \*(CO, output width is always based on the terminal at which \*(We was invoked whether or not in Batch mode. +.TP 5 +\-\fB1\fR\ \ :\fISingle/Separate-Cpu-States\fR toggle \fR +Starts \*(We with the last remembered Cpu States portion of the \*(SA reversed. +Either all \*(Pu information will be displayed in a single line or +each \*(Pu will be displayed separately, depending on the state of the NUMA Node +\*(CT ('2'). + +\*(XC `1' and '2' \*(CIs for additional information. + .\" ---------------------------------------------------------------------- .SH 2. SUMMARY Display .\" ---------------------------------------------------------------------- diff --git a/top/top.c b/top/top.c index 6a4b8ca3..08d02cc8 100644 --- a/top/top.c +++ b/top/top.c @@ -3650,6 +3650,7 @@ static void parse_args (char **args) { . bunched args are actually handled properly and none are ignored . we tolerate NO whitespace and NO switches -- maybe too tolerant? */ static const char numbs_str[] = "+,-.0123456789"; + static const char wrong_str[] = "+,-."; float tmp_delay = FLT_MAX; int i; @@ -3666,10 +3667,16 @@ static void parse_args (char **args) { case '-': if (cp[1]) ++cp; else if (*args) cp = *args++; - if (strspn(cp, numbs_str)) + if (strspn(cp, wrong_str)) error_exit(fmtmk(N_fmt(WRONG_switch_fmt) , cp, Myname, N_txt(USAGE_abbrev_txt))); continue; + case '1': // ensure behavior identical to run-time toggle + if (CHKw(Curwin, View_CPUNOD)) OFFw(Curwin, View_CPUSUM); + else TOGw(Curwin, View_CPUSUM); + OFFw(Curwin, View_CPUNOD); + SETw(Curwin, View_STATES); + break; case 'b': Batch = 1; break; @@ -3769,8 +3776,7 @@ static void parse_args (char **args) { else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch)); if ((errmsg = user_certify(Curwin, cp, ch))) error_exit(errmsg); cp += strlen(cp); - break; - } + } break; case 'w': { const char *pn = NULL; int ai = 0, ci = 0; diff --git a/top/top_nls.c b/top/top_nls.c index d28ba0c3..331e7888 100644 --- a/top/top_nls.c +++ b/top/top_nls.c @@ -338,7 +338,7 @@ static void build_norm_nlstab (void) { Norm_nlstab[OFF_one_word_txt] = _("Off"); /* Translation Hint: Only the following words should be translated . secs (seconds), max (maximum), user, field, cols (columns)*/ - Norm_nlstab[USAGE_abbrev_txt] = _(" -hv | -bcEHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"); + Norm_nlstab[USAGE_abbrev_txt] = _(" -hv | -bcEHiOSs1 -d secs -n max -u|U user -p pid(s) -o field -w [cols]"); Norm_nlstab[FAIL_statget_txt] = _("failed /proc/stat read"); Norm_nlstab[FOREST_modes_fmt] = _("Forest mode %s"); Norm_nlstab[FAIL_tty_get_txt] = _("failed tty get"); -- 2.40.0