cgls: add --machine/-M

[elogind.git] / src / cgls / cgls.c

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 4bec6a827e115e4f9c8e2118fb9faaa32df7c10d..ef3e5672ab6a3d8857389c3e59c31a9d7ceb610c 100644 (file)
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -29,13 +29,17 @@
 #include "cgroup-show.h"
 #include "cgroup-util.h"
 #include "log.h"
+#include "path-util.h"
 #include "util.h"
 #include "pager.h"
 #include "build.h"
+#include "output-mode.h"
 
 static bool arg_no_pager = false;
 static bool arg_kernel_threads = false;
 static bool arg_all = false;
+static int arg_full = -1;
+static char* arg_machine = NULL;
 
 static void help(void) {
 
@@ -45,7 +49,9 @@ static void help(void) {
                "     --version        Show package version\n"
                "     --no-pager       Do not pipe output into a pager\n"
                "  -a --all            Show all groups, including empty\n"
-               "  -k                  Include kernel threads in output\n",
+               "  --full              Do not ellipsize output\n"
+               "  -k                  Include kernel threads in output\n"
+               "  -M --machine        Show container\n",
                program_invocation_short_name);
 }
 
@@ -53,7 +59,8 @@ static int parse_argv(int argc, char *argv[]) {
 
         enum {
                 ARG_NO_PAGER = 0x100,
-                ARG_VERSION
+                ARG_VERSION,
+                ARG_FULL,
         };
 
         static const struct option options[] = {
@@ -61,6 +68,8 @@ static int parse_argv(int argc, char *argv[]) {
                 { "version",   no_argument,       NULL, ARG_VERSION  },
                 { "no-pager",  no_argument,       NULL, ARG_NO_PAGER },
                 { "all",       no_argument,       NULL, 'a'          },
+                { "full",      no_argument,       NULL, ARG_FULL     },
+                { "machine",   required_argument, NULL, 'M'          },
                 { NULL,        0,                 NULL, 0            }
         };
 
@@ -69,7 +78,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 1);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hka", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hkaM:", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -79,7 +88,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
@@ -91,10 +99,18 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_all = true;
                         break;
 
+                case ARG_FULL:
+                        arg_full = true;
+                        break;
+
                 case 'k':
                         arg_kernel_threads = true;
                         break;
 
+                case 'M':
+                        arg_machine = optarg;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -109,6 +125,8 @@ static int parse_argv(int argc, char *argv[]) {
 
 int main(int argc, char *argv[]) {
         int r = 0, retval = EXIT_FAILURE;
+        int output_flags;
+        char _cleanup_free_ *root = NULL;
 
         log_parse_environment();
         log_open();
@@ -121,23 +139,40 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        if (!arg_no_pager)
-                pager_open();
+        if (!arg_no_pager) {
+                r = pager_open(false);
+                if (r > 0) {
+                        if (arg_full == -1)
+                                arg_full = true;
+                }
+        }
+
+        output_flags =
+                arg_all * OUTPUT_SHOW_ALL |
+                (arg_full > 0) * OUTPUT_FULL_WIDTH;
 
         if (optind < argc) {
-                unsigned i;
+                int i;
 
-                for (i = (unsigned) optind; i < (unsigned) argc; i++) {
+                for (i = optind; i < argc; i++) {
                         int q;
                         printf("%s:\n", argv[i]);
 
-                        q = show_cgroup_by_path(argv[i], NULL, 0, arg_kernel_threads, arg_all);
+                        if (arg_machine)
+                                root = strjoin("machine/", arg_machine, "/", argv[i], NULL);
+                        else
+                                root = strdup(argv[i]);
+                        if (!root)
+                                return log_oom();
+
+                        q = show_cgroup_by_path(root, NULL, 0,
+                                                arg_kernel_threads, output_flags);
                         if (q < 0)
                                 r = q;
                 }
 
         } else {
-                char *p;
+                _cleanup_free_ char *p;
 
                 p = get_current_dir_name();
                 if (!p) {
@@ -145,34 +180,31 @@ int main(int argc, char *argv[]) {
                         goto finish;
                 }
 
-                if (path_startswith(p, "/sys/fs/cgroup")) {
+                if (path_startswith(p, "/sys/fs/cgroup") && !arg_machine) {
                         printf("Working Directory %s:\n", p);
-                        r = show_cgroup_by_path(p, NULL, 0, arg_kernel_threads, arg_all);
+                        r = show_cgroup_by_path(p, NULL, 0,
+                                                arg_kernel_threads, output_flags);
                 } else {
-                        char *root = NULL;
-                        const char *t = NULL;
-
-                        r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root);
-                        if (r < 0)
-                                t = "/";
-                        else {
-                                if (endswith(root, "/system"))
-                                        root[strlen(root)-7] = 0;
-
-                                t = root[0] ? root : "/";
+                        if (arg_machine)
+                                r = cg_get_machine_path(arg_machine, &root);
+                        else
+                                r = cg_get_root_path(&root);
+                        if (r < 0) {
+                                log_error("Failed to get %s path: %s",
+                                          arg_machine ? "machine" : "root", strerror(-r));
+                                goto finish;
                         }
 
-                        r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0, arg_kernel_threads, arg_all);
-                        free(root);
+                        r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0,
+                                        arg_kernel_threads, output_flags);
                 }
-
-                free(p);
         }
 
-        if (r < 0)
-                log_error("Failed to list cgroup tree: %s", strerror(-r));
-
-        retval = EXIT_SUCCESS;
+        if (r < 0) {
+                log_error("Failed to list cgroup tree %s: %s", root, strerror(-r));
+                retval = EXIT_FAILURE;
+        } else
+                retval = EXIT_SUCCESS;
 
 finish:
         pager_close();