ps,top: add an option to show threads. +260 bytes of code

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/libbb/procps.c b/libbb/procps.c
index 974661785..845a2141b 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -110,6 +110,10 @@ static procps_status_t* FAST_FUNC alloc_procps_scan(void)
 void FAST_FUNC free_procps_scan(procps_status_t* sp)
 {
         closedir(sp->dir);
+#if ENABLE_FEATURE_SHOW_THREADS
+        if (sp->task_dir)
+                closedir(sp->task_dir);
+#endif
         free(sp->argv0);
         free(sp->exe);
         IF_SELINUX(free(sp->context);)
@@ -189,14 +193,35 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                 sp = alloc_procps_scan();
 
         for (;;) {
+#if ENABLE_FEATURE_SHOW_THREADS
+                if ((flags & PSSCAN_TASKS) && sp->task_dir) {
+                        entry = readdir(sp->task_dir);
+                        if (entry)
+                                goto got_entry;
+                        closedir(sp->task_dir);
+                        sp->task_dir = NULL;
+                }
+#endif
                 entry = readdir(sp->dir);
                 if (entry == NULL) {
                         free_procps_scan(sp);
                         return NULL;
                 }
+ IF_FEATURE_SHOW_THREADS(got_entry:)
                 pid = bb_strtou(entry->d_name, NULL, 10);
                 if (errno)
                         continue;
+#if ENABLE_FEATURE_SHOW_THREADS
+                if ((flags & PSSCAN_TASKS) && !sp->task_dir) {
+                        /* We found another /proc/PID. Do not use it,
+                         * there will be /proc/PID/task/PID (same PID!),
+                         * so just go ahead and dive into /proc/PID/task. */
+                        char task_dir[sizeof("/proc/%u/task") + sizeof(int)*3];
+                        sprintf(task_dir, "/proc/%u/task", pid);
+                        sp->task_dir = xopendir(task_dir);
+                        continue;
+                }
+#endif
 
                 /* After this point we have to break, not continue
                  * ("continue" would mean that current /proc/NNN