Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle threads better in ps

Browse Source
This commit is contained in:
Kevin Lange 2016-12-17 17:55:31 +09:00
parent bda6978dce
commit 2d5947ad16
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
userspace/core/ps.c
View File

@ -24,6 +24,8 @@
#define LINE_LEN 4096 #define LINE_LEN 4096
static int show_all = 0;
void print_username(int uid) { void print_username(int uid) {
struct passwd * p = getpwuid(uid); struct passwd * p = getpwuid(uid);
@ -42,7 +44,8 @@ void print_entry(struct dirent * dent) {
int read = 1; int read = 1;
char line[LINE_LEN]; char line[LINE_LEN];
int pid, uid; int pid, uid, tgid;
char name[100];
snprintf(tmp, 256, "/proc/%s/status", dent->d_name); snprintf(tmp, 256, "/proc/%s/status", dent->d_name);
f = fopen(tmp, "r"); f = fopen(tmp, "r");
@ -52,13 +55,28 @@ void print_entry(struct dirent * dent) {
sscanf(line, "%s %d", &buf, &pid); sscanf(line, "%s %d", &buf, &pid);
} else if (strstr(line, "Uid:") == line) { } else if (strstr(line, "Uid:") == line) {
sscanf(line, "%s %d", &buf, &uid); sscanf(line, "%s %d", &buf, &uid);
} else if (strstr(line, "Tgid:") == line) {
sscanf(line, "%s %d", &buf, &tgid);
} else if (strstr(line, "Name:") == line) {
sscanf(line, "%s %s", &buf, &name);
} }
} }
fclose(f); fclose(f);
if ((tgid != pid) && !show_all) {
/* Skip threads */
return;
}
print_username(uid); print_username(uid);
printf(" %5d ", pid); if (show_all) {
printf("%5d.%-5d", tgid, pid);
} else {
printf(" %5d", pid);
}
printf(" ");
snprintf(tmp, 256, "/proc/%s/cmdline", dent->d_name); snprintf(tmp, 256, "/proc/%s/cmdline", dent->d_name);
f = fopen(tmp, "r"); f = fopen(tmp, "r");
@ -73,7 +91,11 @@ void print_entry(struct dirent * dent) {
} }
} }
printf("%s\n", buf); if (tgid != pid) {
printf("{%s}\n", buf);
} else {
printf("%s\n", buf);
}
} }
void show_usage(int argc, char * argv[]) { void show_usage(int argc, char * argv[]) {
@ -90,7 +112,6 @@ void show_usage(int argc, char * argv[]) {
int main (int argc, char * argv[]) { int main (int argc, char * argv[]) {
/* Parse arguments */ /* Parse arguments */
int show_all = 0;
if (argc > 1) { if (argc > 1) {
int index, c; int index, c;