summaryrefslogtreecommitdiff
path: root/procps/top.c
diff options
context:
space:
mode:
authorDenis Vlasenko2008-04-19 04:05:28 +0000
committerDenis Vlasenko2008-04-19 04:05:28 +0000
commitfc9fc1f9292861cd1621d884338a766289acdf4a (patch)
tree0a2b0dd81d994e73f77174665dfb3e68e611471e /procps/top.c
parent74f8208f1896ceb2828a84d93999584a8407565b (diff)
downloadbusybox-fc9fc1f9292861cd1621d884338a766289acdf4a.zip
busybox-fc9fc1f9292861cd1621d884338a766289acdf4a.tar.gz
apply all post 1.10.0 fixes
bump version to 1.10.1
Diffstat (limited to 'procps/top.c')
-rw-r--r--procps/top.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/procps/top.c b/procps/top.c
index e3f91c8..206f9e8 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -861,17 +861,22 @@ int top_main(int argc ATTRIBUTE_UNUSED, char **argv)
#else
qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0]));
#endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */
- } else { /* TOPMEM */
+ }
+#if ENABLE_FEATURE_TOPMEM
+ else { /* TOPMEM */
qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort);
}
+#endif
count = lines;
if (OPT_BATCH_MODE || count > ntop) {
count = ntop;
}
if (scan_mask == TOP_MASK)
display_process_list(count, col);
+#if ENABLE_FEATURE_TOPMEM
else
display_topmem_process_list(count, col);
+#endif
clearmems();
if (iterations >= 0 && !--iterations)
break;