emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2009-09-19 22:29:42 +02:00
parent f00cfdfae5
commit b410d4ada7
5 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libbb/procps.c
View File

@@ -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