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

top: shorten some lines by changing a few declarations

Browse Source 
My first blush graphs modes implementation went just a
tad overboard on identifier lengths. As a result, some
program lines were getting quite long. So, this commit
will simply shorten some excessively long identifiers.

Reference(s):
http://www.freelists.org/post/procps/latest-top-enhancements
commit 1d171ec741

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2014-06-22 00:00:00 -05:00 committed by Craig Small
parent ff7af8d982
commit f33d49c6cf
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
top/top.c
View File

@ -5058,24 +5058,24 @@ static void summary_hlp (CPU_t *cpu, const char *pfx) {
(who or what is explained by the passed prefix) */ (who or what is explained by the passed prefix) */
if (Rc.graph_cpus) { if (Rc.graph_cpus) {
static struct { static struct {
const char *user; const char *syst; const char *type; const char *user, *syst, *type;
} gtab[] = { } gtab[] = {
{ "%-.*s~7", "%-.*s~8", Graph_bars }, { "%-.*s~7", "%-.*s~8", Graph_bars },
{ "%-.*s~4", "%-.*s~6", Graph_blks } { "%-.*s~4", "%-.*s~6", Graph_blks }
}; };
char graph_user[SMLBUFSIZ], graph_syst[SMLBUFSIZ], graph_dual[MEDBUFSIZ]; char user[SMLBUFSIZ], syst[SMLBUFSIZ], dual[MEDBUFSIZ];
int ix = Rc.graph_cpus - 1; int ix = Rc.graph_cpus - 1;
float percent_user = (float)(u_frme + n_frme) * scale, float pct_user = (float)(u_frme + n_frme) * scale,
percent_syst = (float)s_frme * scale; pct_syst = (float)s_frme * scale;
snprintf(graph_user, sizeof(graph_user), gtab[ix].user, (int)(percent_user + .5), gtab[ix].type); snprintf(user, sizeof(user), gtab[ix].user, (int)(pct_user + .5), gtab[ix].type);
snprintf(graph_syst, sizeof(graph_syst), gtab[ix].syst, (int)(percent_syst + .5), gtab[ix].type); snprintf(syst, sizeof(syst), gtab[ix].syst, (int)(pct_syst + .5), gtab[ix].type);
snprintf(graph_dual, sizeof(graph_dual), "%s%s", graph_user, graph_syst); snprintf(dual, sizeof(dual), "%s%s", user, syst);
#ifdef GRAPHS_ALIGN #ifdef GRAPHS_ALIGN
show_special(0, fmtmk("%%%s ~3%#5.1f~2/%-#8.1f~3 [~1%-104.104s]~1\n" show_special(0, fmtmk("%%%s ~3%#5.1f~2/%-#8.1f~3 [~1%-104.104s]~1\n"
#else #else
show_special(0, fmtmk("%%%s ~3%#5.1f~2/%-#5.1f~3 [~1%-104.104s]~1\n" show_special(0, fmtmk("%%%s ~3%#5.1f~2/%-#5.1f~3 [~1%-104.104s]~1\n"
#endif #endif
, pfx, percent_user, percent_syst, graph_dual)); , pfx, pct_user, pct_syst, dual));
} else { } else {
show_special(0, fmtmk(Cpu_States_fmts, pfx show_special(0, fmtmk(Cpu_States_fmts, pfx
, (float)u_frme * scale, (float)s_frme * scale , (float)u_frme * scale, (float)s_frme * scale
@ -5213,20 +5213,20 @@ numa_nope:
if (Rc.graph_mems) { if (Rc.graph_mems) {
static struct { static struct {
const char *used; const char *misc; const char *swap; const char *type; const char *used, *misc, *swap, *type;
} gtab[] = { } gtab[] = {
{ "%-.*s~7", "%-.*s~8", "%-.*s~8", Graph_bars }, { "%-.*s~7", "%-.*s~8", "%-.*s~8", Graph_bars },
{ "%-.*s~4", "%-.*s~6", "%-.*s~6", Graph_blks } { "%-.*s~4", "%-.*s~6", "%-.*s~6", Graph_blks }
}; };
char graph_used[SMLBUFSIZ], graph_util[SMLBUFSIZ], graph_dual[MEDBUFSIZ]; char used[SMLBUFSIZ], util[SMLBUFSIZ], dual[MEDBUFSIZ];
int ix = Rc.graph_mems - 1; int ix = Rc.graph_mems - 1;
float percent_used = (float)kb_main_my_used * (100.0 / (float)kb_main_total), float pct_used = (float)kb_main_my_used * (100.0 / (float)kb_main_total),
percent_misc = (float)(kb_main_buffers + kb_main_cached) * (100.0 / (float)kb_main_total), pct_misc = (float)(kb_main_buffers + kb_main_cached) * (100.0 / (float)kb_main_total),
percent_swap = (float)kb_swap_used * (100.0 / (float)kb_swap_total); pct_swap = (float)kb_swap_used * (100.0 / (float)kb_swap_total);
snprintf(graph_used, sizeof(graph_used), gtab[ix].used, (int)(percent_used + .5), gtab[ix].type); snprintf(used, sizeof(used), gtab[ix].used, (int)(pct_used + .5), gtab[ix].type);
snprintf(graph_util, sizeof(graph_util), gtab[ix].misc, (int)(percent_misc + .5), gtab[ix].type); snprintf(util, sizeof(util), gtab[ix].misc, (int)(pct_misc + .5), gtab[ix].type);
snprintf(graph_dual, sizeof(graph_dual), "%s%s", graph_used, graph_util); snprintf(dual, sizeof(dual), "%s%s", used, util);
snprintf(graph_util, sizeof(graph_util), gtab[ix].swap, (int)(percent_swap + .5), gtab[ix].type); snprintf(util, sizeof(util), gtab[ix].swap, (int)(pct_swap + .5), gtab[ix].type);
prT(bfT(0), mkM(total)); prT(bfT(1), mkS(total)); prT(bfT(0), mkM(total)); prT(bfT(1), mkS(total));
show_special(0, fmtmk( show_special(0, fmtmk(
#ifdef GRAPHS_ALIGN #ifdef GRAPHS_ALIGN
@ -5236,8 +5236,8 @@ numa_nope:
#else #else
"%s %s:~3%#5.1f~2/%-.9s~3[~1%-104.104s]~1\n%s %s:~3%#5.1f~2/%-.9s~3[~1%-102.102s]~1\n" "%s %s:~3%#5.1f~2/%-.9s~3[~1%-104.104s]~1\n%s %s:~3%#5.1f~2/%-.9s~3[~1%-102.102s]~1\n"
#endif #endif
, scT(label), N_txt(WORD_abv_mem_txt), percent_used + percent_misc, bfT(0), graph_dual , scT(label), N_txt(WORD_abv_mem_txt), pct_used + pct_misc, bfT(0), dual
, scT(label), N_txt(WORD_abv_swp_txt), percent_swap, bfT(1), graph_util)); , scT(label), N_txt(WORD_abv_swp_txt), pct_swap, bfT(1), util));
} else { } else {
prT(bfT(0), mkM(total)); prT(bfT(1), mkM(free)); prT(bfT(0), mkM(total)); prT(bfT(1), mkM(free));
prT(bfT(2), mkM(my_used)); prT(bfT(3), mkM(buffers)); prT(bfT(2), mkM(my_used)); prT(bfT(3), mkM(buffers));