summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-06 05:38:12 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-06 05:38:12 +0200
commit5f75059770f5faacfd52596d1a612bffcdd87187 (patch)
treec917e0396a9f59db233956ae4a4174c49516beb5
parent72f957066d9ccc43699c813d0498fc7f6732a838 (diff)
systemctl: fix parsing of cgroup contents
-rw-r--r--src/systemctl.c43
1 files changed, 27 insertions, 16 deletions
diff --git a/src/systemctl.c b/src/systemctl.c
index 73b0fc48cc..6977f85b3f 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -935,9 +935,9 @@ finish:
}
static void show_cgroup(const char *name) {
- char *fn, *pids;
- int r;
- char *p;
+ char *fn;
+ FILE *f;
+ pid_t last = 0;
if (!startswith(name, "name=systemd:"))
return;
@@ -945,30 +945,41 @@ static void show_cgroup(const char *name) {
if (asprintf(&fn, "/cgroup/systemd/%s/tasks", name + 13) < 0)
return;
- r = read_one_line_file(fn, &pids);
+ f = fopen(fn, "r");
free(fn);
- if (r < 0)
+ if (!f)
return;
- p = pids;
- while (p[0]) {
- unsigned long ul;
- char *t = NULL;
+ printf("\t\t │\n");
- p += strspn(p, WHITESPACE);
+ while (!feof(f)) {
+ unsigned long ul;
- errno = 0;
- ul = strtoul(p, &p, 0);
- if (errno != 0 || ul <= 0)
+ if (fscanf(f, "%lu", &ul) != 1)
break;
- get_process_cmdline((pid_t) ul, 60, &t);
- printf("\t\t%lu %s\n", ul, strna(t));
+ if (ul <= 0)
+ continue;
+
+ if (last > 0) {
+ char *t = NULL;
+ get_process_cmdline(last, 60, &t);
+ printf("\t\t ├ %lu %s\n", (unsigned long) last, strna(t));
+ free(t);
+ }
+
+ last = (pid_t) ul;
+ }
+
+ if (last > 0) {
+ char *t = NULL;
+ get_process_cmdline(last, 60, &t);
+ printf("\t\t └ %lu %s\n", (unsigned long) last, strna(t));
free(t);
}
- free(pids);
+ fclose(f);
}
typedef struct UnitStatusInfo {