aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-09-19 22:29:42 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-09-19 22:29:42 +0200
commitb410d4ada73e9ebb30b2b50266a13c30479f5f21 (patch)
tree0d842b9c0885d1cf06fa6aa67a720b31b89cca55 /procps
parentf00cfdfae53d8ef623238ecb1001969b5f649cbd (diff)
downloadbusybox-b410d4ada73e9ebb30b2b50266a13c30479f5f21.tar.gz
busybox-b410d4ada73e9ebb30b2b50266a13c30479f5f21.tar.bz2
ps,top: add an option to show threads. +260 bytes of code
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps')
-rw-r--r--procps/Config.in8
-rw-r--r--procps/ps.c31
-rw-r--r--procps/top.c21
3 files changed, 47 insertions, 13 deletions
diff --git a/procps/Config.in b/procps/Config.in
index 9146ff6bf..6a9a36638 100644
--- a/procps/Config.in
+++ b/procps/Config.in
@@ -188,6 +188,13 @@ config FEATURE_TOPMEM
help
Enable 's' in top (gives lots of memory info).
+config FEATURE_SHOW_THREADS
+ bool "Support for showing threads in ps/top"
+ default n
+ depends on PS || TOP
+ help
+ Enables ps -T option and 'h' command in top
+
config UPTIME
bool "uptime"
default n
@@ -203,5 +210,4 @@ config WATCH
watch is used to execute a program periodically, showing
output to the screen.
-
endmenu
diff --git a/procps/ps.c b/procps/ps.c
index 6523f0f38..b35b49c04 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -17,7 +17,6 @@ enum { MAX_WIDTH = 2*1024 };
#if ENABLE_DESKTOP
#include <sys/times.h> /* for times() */
-//#include <sys/sysinfo.h> /* for sysinfo() */
#ifndef AT_CLKTCK
#define AT_CLKTCK 17
#endif
@@ -61,6 +60,7 @@ struct globals {
#define kernel_HZ (G.kernel_HZ )
#define seconds_since_boot (G.seconds_since_boot)
#define default_o (G.default_o )
+#define INIT_G() do { } while (0)
#if ENABLE_FEATURE_PS_TIME
/* for ELF executables, notes are pushed before environment and args */
@@ -452,21 +452,34 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
{
procps_status_t *p;
llist_t* opt_o = NULL;
- IF_SELINUX(int opt;)
+ int opt;
+ enum {
+ OPT_Z = (1 << 0),
+ OPT_o = (1 << 1),
+ OPT_a = (1 << 2),
+ OPT_A = (1 << 3),
+ OPT_d = (1 << 4),
+ OPT_e = (1 << 5),
+ OPT_f = (1 << 6),
+ OPT_l = (1 << 7),
+ OPT_T = (1 << 8) * ENABLE_FEATURE_SHOW_THREADS,
+ };
+
+ INIT_G();
// POSIX:
// -a Write information for all processes associated with terminals
// Implementations may omit session leaders from this list
// -A Write information for all processes
// -d Write information for all processes, except session leaders
- // -e Write information for all processes (equivalent to -A.)
+ // -e Write information for all processes (equivalent to -A)
// -f Generate a full listing
// -l Generate a long listing
// -o col1,col2,col3=header
// Select which columns to display
/* We allow (and ignore) most of the above. FIXME */
opt_complementary = "o::";
- IF_SELINUX(opt =) getopt32(argv, "Zo:aAdefl", &opt_o);
+ opt = getopt32(argv, "Zo:aAdefl" IF_FEATURE_SHOW_THREADS("T"), &opt_o);
if (opt_o) {
do {
parse_o(llist_pop(&opt_o));
@@ -474,7 +487,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
} else {
/* Below: parse_o() needs char*, NOT const char*... */
#if ENABLE_SELINUX
- if (!(opt & 1) || !is_selinux_enabled()) {
+ if (!(opt & OPT_Z) || !is_selinux_enabled()) {
/* no -Z or no SELinux: do not show LABEL */
strcpy(default_o, DEFAULT_O_STR + sizeof(SELINUX_O_PREFIX)-1);
} else
@@ -485,6 +498,10 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
parse_o(default_o);
}
post_process();
+#if ENABLE_FEATURE_SHOW_THREADS
+ if (opt & OPT_T)
+ need_flags |= PSSCAN_TASKS;
+#endif
/* Was INT_MAX, but some libc's go belly up with printf("%.*s")
* and such large widths */
@@ -497,7 +514,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
format_header();
p = NULL;
- while ((p = procps_scan(p, need_flags))) {
+ while ((p = procps_scan(p, need_flags)) != NULL) {
format_process(p);
}
@@ -558,7 +575,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
| PSSCAN_VSZ
| PSSCAN_COMM
| use_selinux
- ))) {
+ )) != NULL) {
#if ENABLE_SELINUX
if (use_selinux) {
len = printf("%5u %-32.32s %s ",
diff --git a/procps/top.c b/procps/top.c
index a1ad7881e..dbaaca14f 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -976,7 +976,10 @@ int top_main(int argc UNUSED_PARAM, char **argv)
/* read process IDs & status for all the processes */
while ((p = procps_scan(p, scan_mask)) != NULL) {
int n;
- if (scan_mask == TOP_MASK) {
+#if ENABLE_FEATURE_TOPMEM
+ if (scan_mask != TOPMEM_MASK)
+#endif
+ {
n = ntop;
top = xrealloc_vector(top, 6, ntop++);
top[n].pid = p->pid;
@@ -991,8 +994,9 @@ int top_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_TOP_SMP_PROCESS
top[n].last_seen_on_cpu = p->last_seen_on_cpu;
#endif
- } else { /* TOPMEM */
+ }
#if ENABLE_FEATURE_TOPMEM
+ else { /* TOPMEM */
if (!(p->mapped_ro | p->mapped_rw))
continue; /* kernel threads are ignored */
n = ntop;
@@ -1007,15 +1011,15 @@ int top_main(int argc UNUSED_PARAM, char **argv)
topmem[n].dirty = p->private_dirty + p->shared_dirty;
topmem[n].dirty_sh = p->shared_dirty;
topmem[n].stack = p->stack;
-#endif
}
+#endif
} /* end of "while we read /proc" */
if (ntop == 0) {
bb_error_msg("no process info in /proc");
break;
}
- if (scan_mask == TOP_MASK) {
+ if (scan_mask != TOPMEM_MASK) {
#if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
if (!prev_hist_count) {
do_stats();
@@ -1039,7 +1043,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
if (OPT_BATCH_MODE) {
lines_rem = INT_MAX;
}
- if (scan_mask == TOP_MASK)
+ if (scan_mask != TOPMEM_MASK)
display_process_list(lines_rem, col);
#if ENABLE_FEATURE_TOPMEM
else
@@ -1076,6 +1080,13 @@ int top_main(int argc UNUSED_PARAM, char **argv)
sort_function[2] = time_sort;
# endif
}
+#if ENABLE_FEATURE_SHOW_THREADS
+ if (c == 'h'
+ IF_FEATURE_TOPMEM(&& scan_mask != TOPMEM_MASK)
+ ) {
+ scan_mask ^= PSSCAN_TASKS;
+ }
+#endif
# if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
if (c == 'p') {
IF_FEATURE_TOPMEM(scan_mask = TOP_MASK;)