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

top: distinct separator if two abreast summary display

Browse Source 
When displaying detailed memory statistics two abreast
data for the lines are less than those for cpus. So we
can exploit such a difference to provide a distinctive
separator. This may help separating cpu & memory data.

[ in truth, this happened before this patch. what we ]
[ are doing now is polishing that accidental feature ]
[ and placing it under the control of a conditional. ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2022-09-18 00:00:00 -05:00 committed by Craig Small
parent e5386f1f21
commit 96153c0f0c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/top/top.c
View File

@ -253,7 +253,11 @@ static const char Osel_filterI_fmt[] = "\ttype=%d,\t" OSEL_FILTER "%*s\n";
static char Adjoin_sp[] = " "; static char Adjoin_sp[] = " ";
#define ADJOIN_space (sizeof(Adjoin_sp) - 1) // 1 for null #define ADJOIN_space (sizeof(Adjoin_sp) - 1) // 1 for null
#else #else
#ifdef TOG4_STD_SEP
static char Adjoin_sp[] = "~1 ~6 ";
#else
static char Adjoin_sp[] = " ~6 ~1"; static char Adjoin_sp[] = " ~6 ~1";
#endif
#define ADJOIN_space (sizeof(Adjoin_sp) - 5) // 1 for null + 4 unprintable #define ADJOIN_space (sizeof(Adjoin_sp) - 5) // 1 for null + 4 unprintable
#endif #endif
#define ADJOIN_limit 8 #define ADJOIN_limit 8

4
src/top/top.h
View File

@ -62,6 +62,7 @@
//#define THREADED_TSK /* separate background thread for tsk updt */ //#define THREADED_TSK /* separate background thread for tsk updt */
//#define TOG4_OFF_MEM /* don't show two abreast memory statistic */ //#define TOG4_OFF_MEM /* don't show two abreast memory statistic */
//#define TOG4_OFF_SEP /* don't show two abreast visual separator */ //#define TOG4_OFF_SEP /* don't show two abreast visual separator */
//#define TOG4_STD_SEP /* normal mem sep if 2 abreast & no graphs */
//#define TREE_NORESET /* sort keys should not force 'V' view off */ //#define TREE_NORESET /* sort keys should not force 'V' view off */
//#define TREE_SCANALL /* rescan array w/ forest view, avoid sort */ //#define TREE_SCANALL /* rescan array w/ forest view, avoid sort */
//#define TREE_VALTMRK /* use an indented '+' with collapsed pids */ //#define TREE_VALTMRK /* use an indented '+' with collapsed pids */
@ -625,6 +626,9 @@ typedef struct WIN_t {
#if defined(USE_X_COLHDR) #if defined(USE_X_COLHDR)
# warning 'USE_X_COLHDR' makes parts of man page misleading (4e, 5d & 5e) # warning 'USE_X_COLHDR' makes parts of man page misleading (4e, 5d & 5e)
#endif #endif
#if defined(TOG4_STD_SEP) && defined(TOG4_OFF_SEP)
# warning 'TOG4_STD_SEP' has no effect when 'TOG4_OFF_SEP' is active
#endif
/*###### Some Prototypes (ha!) #########################################*/ /*###### Some Prototypes (ha!) #########################################*/

6
src/top/top_nls.c
View File

@ -754,17 +754,17 @@ static void build_uniq_nlstab (void) {
. us = user, sy = system, ni = nice, id = idle, wa = wait, . us = user, sy = system, ni = nice, id = idle, wa = wait,
. hi hardware interrupt, si = software interrupt */ . hi hardware interrupt, si = software interrupt */
Uniq_nlstab[STATE_lin2x6_fmt] = _("%s~3" Uniq_nlstab[STATE_lin2x6_fmt] = _("%s~3"
" %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f ~2wa,~3 %#5.1f ~2hi,~3 %#5.1f ~2si~3"); " %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f ~2wa,~3 %#5.1f ~2hi,~3 %#5.1f ~2si~3 ~1");
/* Translation Hint: Only the following abbreviations need be translated /* Translation Hint: Only the following abbreviations need be translated
. us = user, sy = system, ni = nice, id = idle, wa = wait, . us = user, sy = system, ni = nice, id = idle, wa = wait,
. hi hardware interrupt, si = software interrupt, st = steal time */ . hi hardware interrupt, si = software interrupt, st = steal time */
Uniq_nlstab[STATE_lin2x7_fmt] = _("%s~3" Uniq_nlstab[STATE_lin2x7_fmt] = _("%s~3"
"%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3"); "%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f ~2wa,~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3 ~1");
/* Translation Hint: next 2 must be treated together, with WORDS above & below aligned */ /* Translation Hint: next 2 must be treated together, with WORDS above & below aligned */
Uniq_nlstab[MEMORY_line1_fmt] = _("" Uniq_nlstab[MEMORY_line1_fmt] = _(""
"%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3 "); "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3 ~1 ");
Uniq_nlstab[MEMORY_line2_fmt] = _("" Uniq_nlstab[MEMORY_line2_fmt] = _(""
"%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used.~3 %9.9s~2avail %s~3"); "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used.~3 %9.9s~2avail %s~3");