diff options
| author | Denis Vlasenko | 2009-03-03 11:55:31 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2009-03-03 11:55:31 +0000 |
| commit | 7886275c982286e69fef12236d119ca39b831cec (patch) | |
| tree | e226f3e0c7a55166d4eb5d5782cd146964416246 /procps | |
| parent | 7e0c243ad53c8e6a56250ebf9d43edd6683ae1ac (diff) | |
| download | busybox-7886275c982286e69fef12236d119ca39b831cec.zip busybox-7886275c982286e69fef12236d119ca39b831cec.tar.gz | |
top: make it work again on 2.4 kernels (closes bug 125)
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/top.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/procps/top.c b/procps/top.c index 8c58b90..b595142 100644 --- a/procps/top.c +++ b/procps/top.c @@ -50,7 +50,9 @@ typedef struct top_status_t { } top_status_t; typedef struct jiffy_counts_t { - unsigned long long usr,nic,sys,idle,iowait,irq,softirq,steal; + /* Linux 2.4.x has only first four */ + unsigned long long usr, nic, sys, idle; + unsigned long long iowait, irq, softirq, steal; unsigned long long total; unsigned long long busy; } jiffy_counts_t; @@ -179,15 +181,12 @@ static int mult_lvl_cmp(void* a, void* b) return 0; } -/* NOINLINE so that complier doesn't unfold the call - * causing multiple copies of the arithmatic instrns - */ static NOINLINE int read_cpu_jiffy(FILE *fp, jiffy_counts_t *p_jif) { #if !ENABLE_FEATURE_TOP_SMP_CPU - static const char fmt[] = "cpu %lld %lld %lld %lld %lld %lld %lld %lld"; + static const char fmt[] = "cpu %llu %llu %llu %llu %llu %llu %llu %llu"; #else - static const char fmt[] = "cp%*s %lld %lld %lld %lld %lld %lld %lld %lld"; + static const char fmt[] = "cp%*s %llu %llu %llu %llu %llu %llu %llu %llu"; #endif int ret; @@ -197,7 +196,7 @@ static NOINLINE int read_cpu_jiffy(FILE *fp, jiffy_counts_t *p_jif) &p_jif->usr, &p_jif->nic, &p_jif->sys, &p_jif->idle, &p_jif->iowait, &p_jif->irq, &p_jif->softirq, &p_jif->steal); - if (ret > 4) { + if (ret >= 4) { p_jif->total = p_jif->usr + p_jif->nic + p_jif->sys + p_jif->idle + p_jif->iowait + p_jif->irq + p_jif->softirq + p_jif->steal; /* procps 2.x does not count iowait as busy time */ |