X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcgroup-show.c;h=ee2a241c9fdfb0a8ca8e6892dff7f35b4872f111;hp=af44729a51ae61e729c4d783ddfe8848121ca91d;hb=b070e7f3c9ed680c821bd89d42506695f2438506;hpb=e364ad0628b5930a671ae5be863b960f4bd748a8

diff --git a/src/cgroup-show.c b/src/cgroup-show.c
index af44729a5..ee2a241c9 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.
@@ -50,7 +50,7 @@ static unsigned ilog10(unsigned long ul) {
         return n;
 }
 
-static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigned n_columns, bool more) {
+static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigned n_columns, bool more, bool kernel_threads) {
         char *fn;
         FILE *f;
         size_t n = 0, n_allocated = 0;
@@ -82,6 +82,9 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
 
         while ((r = cg_read_pid(f, &pid)) > 0) {
 
+                if (!kernel_threads && is_kernel_thread(pid) > 0)
+                        continue;
+
                 if (n >= n_allocated) {
                         pid_t *npids;
 
@@ -133,7 +136,7 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
                 for (i = 0; i < n; i++) {
                         char *t = NULL;
 
-                        get_process_cmdline(pids[i], n_columns, &t);
+                        get_process_cmdline(pids[i], n_columns, true, &t);
 
                         printf("%s%s %*lu %s\n",
                                prefix,
@@ -157,7 +160,7 @@ finish:
         return r;
 }
 
-int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns) {
+int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns, bool kernel_threads) {
         DIR *d;
         char *last = NULL;
         char *p1 = NULL, *p2 = NULL, *fn = NULL, *gn = NULL;
@@ -181,7 +184,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
         while ((r = cg_read_subgroup(d, &gn)) > 0) {
 
                 if (!shown_pids) {
-                        show_cgroup_one_by_path(path, prefix, n_columns, true);
+                        show_cgroup_one_by_path(path, prefix, n_columns, true, kernel_threads);
                         shown_pids = true;
                 }
 
@@ -194,7 +197,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
                                         goto finish;
                                 }
 
-                        show_cgroup_by_path(last, p1, n_columns-2);
+                        show_cgroup_by_path(last, p1, n_columns-2, kernel_threads);
 
                         free(last);
                         last = NULL;
@@ -213,7 +216,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
                 goto finish;
 
         if (!shown_pids)
-                show_cgroup_one_by_path(path, prefix, n_columns, !!last);
+                show_cgroup_one_by_path(path, prefix, n_columns, !!last, kernel_threads);
 
         if (last) {
                 printf("%s\342\224\224 %s\n", prefix, file_name_from_path(last));
@@ -224,7 +227,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
                                 goto finish;
                         }
 
-                show_cgroup_by_path(last, p2, n_columns-2);
+                show_cgroup_by_path(last, p2, n_columns-2, kernel_threads);
         }
 
         r = 0;
@@ -240,17 +243,18 @@ finish:
         return r;
 }
 
-int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned n_columns) {
+int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned n_columns, bool kernel_threads) {
         char *p;
         int r;
 
         assert(controller);
         assert(path);
 
-        if ((r = cg_get_path(controller, path, NULL, &p)) < 0)
+        r = cg_get_path(controller, path, NULL, &p);
+        if (r < 0)
                 return r;
 
-        r = show_cgroup_by_path(p, prefix, n_columns);
+        r = show_cgroup_by_path(p, prefix, n_columns, kernel_threads);
         free(p);
 
         return r;