diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-17 08:29:48 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-17 08:29:48 +0000 |
| commit | 856be770a66a4d928f13c9d2f401dc1092e5270e (patch) | |
| tree | 62c6391260ae26ec9a383e72265a4ab3f6894373 /procps | |
| parent | 7f175ccbc38c0de2423a9554f8ee1663431845d9 (diff) | |
| download | busybox-856be770a66a4d928f13c9d2f401dc1092e5270e.tar.gz | |
assorted fixes for breakage found by randomconfig
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/top.c | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/procps/top.c b/procps/top.c index e9ccac0cd..85699b027 100644 --- a/procps/top.c +++ b/procps/top.c @@ -219,7 +219,9 @@ static unsigned long display_generic(int scr_width) char buf[80]; char scrbuf[80]; unsigned long total, used, mfree, shared, buffers, cached; +#if ENABLE_FEATURE_TOP_DECIMALS || ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS unsigned total_diff; +#endif #if ENABLE_FEATURE_TOP_DECIMALS /* formats 7 char string (8 with terminating NUL) */ @@ -305,12 +307,12 @@ static unsigned long display_generic(int scr_width) /* clear screen & go to top */ printf(OPT_BATCH_MODE ? "%s\n" : "\e[H\e[J%s\n", scrbuf); - if (ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS) { - /* - * xxx% = (jif.xxx - prev_jif.xxx) / (jif.total - prev_jif.total) * 100% - */ - /* using (unsigned) casts to make operations cheaper */ - total_diff = ((unsigned)(jif.total - prev_jif.total) ? : 1); +#if ENABLE_FEATURE_TOP_CPU_GLOBAL_PERCENTS + /* + * xxx% = (jif.xxx - prev_jif.xxx) / (jif.total - prev_jif.total) * 100% + */ + /* using (unsigned) casts to make operations cheaper */ + total_diff = ((unsigned)(jif.total - prev_jif.total) ? : 1); #if ENABLE_FEATURE_TOP_DECIMALS /* Generated code is approx +0.3k */ #define CALC_STAT(xxx) char xxx[8] @@ -321,30 +323,30 @@ static unsigned long display_generic(int scr_width) #define SHOW_STAT(xxx) xxx #define FMT "%4u%% " #endif - { /* need block: CALC_STAT are declarations */ - CALC_STAT(usr); - CALC_STAT(sys); - CALC_STAT(nic); - CALC_STAT(idle); - CALC_STAT(iowait); - CALC_STAT(irq); - CALC_STAT(softirq); - //CALC_STAT(steal); - - snprintf(scrbuf, scr_width, - /* Barely fits in 79 chars when in "decimals" mode. */ - "CPU:"FMT"usr"FMT"sys"FMT"nice"FMT"idle"FMT"io"FMT"irq"FMT"softirq", - SHOW_STAT(usr), SHOW_STAT(sys), SHOW_STAT(nic), SHOW_STAT(idle), - SHOW_STAT(iowait), SHOW_STAT(irq), SHOW_STAT(softirq) - //, SHOW_STAT(steal) - what is this 'steal' thing? - // I doubt anyone wants to know it - ); - } - puts(scrbuf); + { /* need block: CALC_STAT are declarations */ + CALC_STAT(usr); + CALC_STAT(sys); + CALC_STAT(nic); + CALC_STAT(idle); + CALC_STAT(iowait); + CALC_STAT(irq); + CALC_STAT(softirq); + //CALC_STAT(steal); + + snprintf(scrbuf, scr_width, + /* Barely fits in 79 chars when in "decimals" mode. */ + "CPU:"FMT"usr"FMT"sys"FMT"nice"FMT"idle"FMT"io"FMT"irq"FMT"softirq", + SHOW_STAT(usr), SHOW_STAT(sys), SHOW_STAT(nic), SHOW_STAT(idle), + SHOW_STAT(iowait), SHOW_STAT(irq), SHOW_STAT(softirq) + //, SHOW_STAT(steal) - what is this 'steal' thing? + // I doubt anyone wants to know it + ); + } + puts(scrbuf); #undef SHOW_STAT #undef CALC_STAT #undef FMT - } +#endif /* read load average as a string */ buf[0] = '\0'; |