along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <limits.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include "pager.h"
#include "build.h"
#include "output-mode.h"
+#include "fileio.h"
+#include "sd-bus.h"
+#include "bus-util.h"
+#include "bus-error.h"
+#include "unit-name.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) {
-
printf("%s [OPTIONS...] [CGROUP...]\n\n"
"Recursively show control group contents.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" -a --all Show all groups, including empty\n"
- " --full Do not ellipsize output\n"
- " -k Include kernel threads in output\n",
- program_invocation_short_name);
+ " -l --full Do not ellipsize output\n"
+ " -k Include kernel threads in output\n"
+ " -M --machine= Show container\n"
+ , program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_NO_PAGER = 0x100,
ARG_VERSION,
- ARG_FULL,
};
static const struct option options[] = {
{ "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 },
- { NULL, 0, NULL, 0 }
+ { "full", no_argument, NULL, 'l' },
+ { "machine", required_argument, NULL, 'M' },
+ {}
};
int c;
assert(argc >= 1);
assert(argv);
- while ((c = getopt_long(argc, argv, "hka", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hkalM:", options, NULL)) >= 0)
switch (c) {
arg_all = true;
break;
- case ARG_FULL:
+ case 'l':
arg_full = true;
break;
arg_kernel_threads = true;
break;
+ case 'M':
+ arg_machine = optarg;
+ break;
+
case '?':
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
- }
return 1;
}
+static int get_cgroup_root(char **ret) {
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL;
+ _cleanup_free_ char *unit = NULL, *path = NULL;
+ const char *m;
+ int r;
+
+ if (!arg_machine) {
+ r = cg_get_root_path(ret);
+ if (r < 0)
+ return log_error_errno(r, "Failed to get root control group path: %m");
+
+ return 0;
+ }
+
+ m = strjoina("/run/systemd/machines/", arg_machine);
+ r = parse_env_file(m, NEWLINE, "SCOPE", &unit, NULL);
+ if (r < 0)
+ return log_error_errno(r, "Failed to load machine data: %m");
+
+ path = unit_dbus_path_from_name(unit);
+ if (!path)
+ return log_oom();
+
+ r = bus_open_transport(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
+ if (r < 0)
+ return log_error_errno(r, "Failed to create bus connection: %m");
+
+ r = sd_bus_get_property_string(
+ bus,
+ "org.freedesktop.systemd1",
+ path,
+ unit_dbus_interface_from_name(unit),
+ "ControlGroup",
+ &error,
+ ret);
+ if (r < 0)
+ return log_error_errno(r, "Failed to query unit control group path: %s", bus_error_message(&error, r));
+
+ return 0;
+}
+
int main(int argc, char *argv[]) {
- int r = 0, retval = EXIT_FAILURE;
- int output_flags;
+ int r, output_flags;
log_parse_environment();
log_open();
r = parse_argv(argc, argv);
- if (r < 0)
+ if (r <= 0)
goto finish;
- else if (r == 0) {
- retval = EXIT_SUCCESS;
- goto finish;
- }
if (!arg_no_pager) {
r = pager_open(false);
- if (r > 0) {
- if (arg_full == -1)
- arg_full = true;
- }
+ if (r > 0 && arg_full < 0)
+ arg_full = true;
}
output_flags =
(arg_full > 0) * OUTPUT_FULL_WIDTH;
if (optind < argc) {
- unsigned i;
+ _cleanup_free_ char *root = NULL;
+ int i;
- for (i = (unsigned) optind; i < (unsigned) argc; i++) {
+ r = get_cgroup_root(&root);
+ if (r < 0)
+ goto finish;
+
+ 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, output_flags);
+ if (path_startswith(argv[i], "/sys/fs/cgroup")) {
+
+ printf("Directory %s:\n", argv[i]);
+ fflush(stdout);
+
+ q = show_cgroup_by_path(argv[i], NULL, 0, arg_kernel_threads, output_flags);
+ } else {
+ _cleanup_free_ char *c = NULL, *p = NULL, *j = NULL;
+ const char *controller, *path;
+
+ r = cg_split_spec(argv[i], &c, &p);
+ if (r < 0) {
+ log_error_errno(r, "Failed to split argument %s: %m", argv[i]);
+ goto finish;
+ }
+
+ controller = c ?: SYSTEMD_CGROUP_CONTROLLER;
+ if (p) {
+ j = strjoin(root, "/", p, NULL);
+ if (!j) {
+ r = log_oom();
+ goto finish;
+ }
+
+ path_kill_slashes(j);
+ path = j;
+ } else
+ path = root;
+
+ if (cg_unified() > 0)
+ printf("Control group %s:\n", path);
+ else
+ printf("Controller %s; control group %s:\n", controller, path);
+ fflush(stdout);
+
+ q = show_cgroup(controller, path, NULL, 0, arg_kernel_threads, output_flags);
+ }
+
if (q < 0)
r = q;
}
} else {
- char _cleanup_free_ *p;
+ bool done = false;
- p = get_current_dir_name();
- if (!p) {
- log_error("Cannot determine current working directory: %m");
- goto finish;
+ if (!arg_machine) {
+ _cleanup_free_ char *cwd = NULL;
+
+ cwd = get_current_dir_name();
+ if (!cwd) {
+ r = log_error_errno(errno, "Cannot determine current working directory: %m");
+ goto finish;
+ }
+
+ if (path_startswith(cwd, "/sys/fs/cgroup")) {
+ printf("Working directory %s:\n", cwd);
+ fflush(stdout);
+
+ r = show_cgroup_by_path(cwd, NULL, 0, arg_kernel_threads, output_flags);
+ done = true;
+ }
}
- if (path_startswith(p, "/sys/fs/cgroup")) {
- printf("Working Directory %s:\n", p);
- r = show_cgroup_by_path(p, NULL, 0,
- arg_kernel_threads, output_flags);
- } else {
- char _cleanup_free_ *root = NULL;
+ if (!done) {
+ _cleanup_free_ char *root = NULL;
- r = cg_get_root_path(&root);
- if (r < 0) {
- log_error("Failed to get root path: %s", strerror(-r));
+ r = get_cgroup_root(&root);
+ if (r < 0)
goto finish;
- }
- r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0,
- arg_kernel_threads, output_flags);
+ printf("Control group %s:\n", isempty(root) ? "/" : root);
+ fflush(stdout);
+
+ r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0, arg_kernel_threads, output_flags);
}
}
if (r < 0)
- log_error("Failed to list cgroup tree: %s", strerror(-r));
-
- retval = EXIT_SUCCESS;
+ log_error_errno(r, "Failed to list cgroup tree: %m");
finish:
pager_close();
- return retval;
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
projects / thirdparty / systemd.git / blobdiff