X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcgroup-show.c;h=bc9c2163291d128504b0624564ffc6443cf534be;hp=b637c1c16327eb28309fea7e151f1732c332ce4e;hb=43515ba0cecda2be8244a9f75078ac4a561092d9;hpb=ab35fb1bc68625c891a19a66473a9c40ca12e69d

diff --git a/src/cgroup-show.c b/src/cgroup-show.c
index b637c1c16..bc9c21632 100644
--- a/src/cgroup-show.c
+++ b/src/cgroup-show.c
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
   This file is part of systemd.
@@ -21,9 +21,12 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <dirent.h>
+#include <errno.h>
 
 #include "util.h"
 #include "macro.h"
+#include "cgroup-util.h"
 #include "cgroup-show.h"
 
 static int compare(const void *a, const void *b) {
@@ -36,34 +39,48 @@ static int compare(const void *a, const void *b) {
         return 0;
 }
 
-void show_cgroup(const char *name, const char *prefix, unsigned columns) {
+static unsigned ilog10(unsigned long ul) {
+        int n = 0;
+
+        while (ul > 0) {
+                n++;
+                ul /= 10;
+        }
+
+        return n;
+}
+
+static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigned n_columns, bool more) {
         char *fn;
         FILE *f;
         size_t n = 0, n_allocated = 0;
         pid_t *pids = NULL;
+        char *p;
+        pid_t pid, biggest = 0;
+        int r;
 
-        if (!startswith(name, "name=systemd:"))
-                return;
+        if (n_columns <= 0)
+                n_columns = columns();
 
-        if (asprintf(&fn, "/cgroup/systemd/%s/cgroup.procs", name + 13) < 0) {
-                log_error("Out of memory");
-                return;
-        }
+        if (!prefix)
+                prefix = "";
 
-        f = fopen(fn, "r");
-        free(fn);
+        if ((r = cg_fix_path(path, &p)) < 0)
+                return r;
 
-        if (!f)
-                return;
+        r = asprintf(&fn, "%s/cgroup.procs", p);
+        free(p);
+
+        if (r < 0)
+                return -ENOMEM;
 
-        while (!feof(f)) {
-                unsigned long ul;
+        f = fopen(fn, "re");
+        free(fn);
 
-                if (fscanf(f, "%lu", &ul) != 1)
-                        break;
+        if (!f)
+                return -errno;
 
-                if (ul <= 0)
-                        continue;
+        while ((r = cg_read_pid(f, &pid)) > 0) {
 
                 if (n >= n_allocated) {
                         pid_t *npids;
@@ -71,7 +88,7 @@ void show_cgroup(const char *name, const char *prefix, unsigned columns) {
                         n_allocated = MAX(16U, n*2U);
 
                         if (!(npids = realloc(pids, sizeof(pid_t) * n_allocated))) {
-                                log_error("Out of memory");
+                                r = -ENOMEM;
                                 goto finish;
                         }
 
@@ -79,9 +96,15 @@ void show_cgroup(const char *name, const char *prefix, unsigned columns) {
                 }
 
                 assert(n < n_allocated);
-                pids[n++] = (pid_t) ul;
+                pids[n++] = pid;
+
+                if (pid > biggest)
+                        biggest = pid;
         }
 
+        if (r < 0)
+                goto finish;
+
         if (n > 0) {
                 unsigned i, m;
 
@@ -102,33 +125,133 @@ void show_cgroup(const char *name, const char *prefix, unsigned columns) {
                 /* And sort */
                 qsort(pids, n, sizeof(pid_t), compare);
 
-                if (!prefix)
-                        prefix = "";
-
-                if (columns > 8)
-                        columns -= 8;
+                if (n_columns > 8)
+                        n_columns -= 8;
                 else
-                        columns = 20;
-
-                printf("%s\342\224\202\n", prefix);
+                        n_columns = 20;
 
                 for (i = 0; i < n; i++) {
                         char *t = NULL;
 
-                        get_process_cmdline(pids[i], columns, &t);
+                        get_process_cmdline(pids[i], n_columns, &t);
 
-                        printf("%s%s %5lu %s\n",
+                        printf("%s%s %*lu %s\n",
                                prefix,
-                               i < n-1 ? "\342\224\234" : "\342\224\224",
-                               (unsigned long) pids[i], strna(t));
+                               (more || i < n-1) ? "\342\224\234" : "\342\224\224",
+                               (int) ilog10(biggest),
+                               (unsigned long) pids[i],
+                               strna(t));
 
                         free(t);
                 }
         }
 
+        r = 0;
+
 finish:
         free(pids);
 
         if (f)
                 fclose(f);
+
+        return r;
+}
+
+int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns) {
+        DIR *d;
+        char *last = NULL;
+        char *p1 = NULL, *p2 = NULL, *fn = NULL, *gn = NULL;
+        bool shown_pids = false;
+        int r;
+
+        if (n_columns <= 0)
+                n_columns = columns();
+
+        if (!prefix)
+                prefix = "";
+
+        if ((r = cg_fix_path(path, &fn)) < 0)
+                return r;
+
+        if (!(d = opendir(fn))) {
+                free(fn);
+                return -errno;
+        }
+
+        while ((r = cg_read_subgroup(d, &gn)) > 0) {
+
+                if (!shown_pids) {
+                        show_cgroup_one_by_path(path, prefix, n_columns, true);
+                        shown_pids = true;
+                }
+
+                if (last) {
+                        printf("%s\342\224\234 %s\n", prefix, file_name_from_path(last));
+
+                        if (!p1)
+                                if (!(p1 = strappend(prefix, "\342\224\202 "))) {
+                                        r = -ENOMEM;
+                                        goto finish;
+                                }
+
+                        show_cgroup_by_path(last, p1, n_columns-2);
+
+                        free(last);
+                        last = NULL;
+                }
+
+                r = asprintf(&last, "%s/%s", fn, gn);
+                free(gn);
+
+                if (r < 0) {
+                        r = -ENOMEM;
+                        goto finish;
+                }
+        }
+
+        if (r < 0)
+                goto finish;
+
+        if (!shown_pids)
+                show_cgroup_one_by_path(path, prefix, n_columns, !!last);
+
+        if (last) {
+                printf("%s\342\224\224 %s\n", prefix, file_name_from_path(last));
+
+                if (!p2)
+                        if (!(p2 = strappend(prefix, "  "))) {
+                                r = -ENOMEM;
+                                goto finish;
+                        }
+
+                show_cgroup_by_path(last, p2, n_columns-2);
+        }
+
+        r = 0;
+
+finish:
+        free(p1);
+        free(p2);
+        free(last);
+        free(fn);
+
+        closedir(d);
+
+        return r;
+}
+
+int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned n_columns) {
+        char *p;
+        int r;
+
+        assert(controller);
+        assert(path);
+
+        if ((r = cg_get_path(controller, path, NULL, &p)) < 0)
+                return r;
+
+        r = show_cgroup_by_path(p, prefix, n_columns);
+        free(p);
+
+        return r;
 }