#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 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"
" -a --all Show all groups, including empty\n"
" -l --full Do not ellipsize output\n"
" -k Include kernel threads in output\n"
- " -M --machine Show container\n",
- program_invocation_short_name);
+ " -M --machine Show container\n"
+ , program_invocation_short_name);
}
static int parse_argv(int argc, char *argv[]) {
{ "all", no_argument, NULL, 'a' },
{ "full", no_argument, NULL, 'l' },
{ "machine", required_argument, NULL, 'M' },
- { NULL, 0, NULL, 0 }
+ {}
};
int c;
assert(argc >= 1);
assert(argv);
- while ((c = getopt_long(argc, argv, "hkalM:", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hkalM:", options, NULL)) >= 0)
switch (c) {
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
- }
return 1;
}
int main(int argc, char *argv[]) {
int r = 0, retval = EXIT_FAILURE;
int output_flags;
- char _cleanup_free_ *root = NULL;
+ _cleanup_free_ char *root = NULL;
+ _cleanup_bus_close_unref_ sd_bus *bus = NULL;
log_parse_environment();
log_open();
arg_all * OUTPUT_SHOW_ALL |
(arg_full > 0) * OUTPUT_FULL_WIDTH;
+ r = bus_open_transport(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
+ if (r < 0) {
+ log_error_errno(r, "Failed to create bus connection: %m");
+ goto finish;
+ }
+
if (optind < argc) {
int i;
for (i = optind; i < argc; i++) {
int q;
- printf("%s:\n", argv[i]);
+
+ fprintf(stdout, "%s:\n", argv[i]);
+ fflush(stdout);
if (arg_machine)
root = strjoin("machine/", arg_machine, "/", argv[i], NULL);
p = get_current_dir_name();
if (!p) {
- log_error("Cannot determine current working directory: %m");
+ log_error_errno(errno, "Cannot determine current working directory: %m");
goto finish;
}
} else {
if (arg_machine) {
char *m;
+ const char *cgroup;
+ _cleanup_free_ char *scope = NULL;
+ _cleanup_free_ char *path = NULL;
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+
m = strappenda("/run/systemd/machines/", arg_machine);
- r = parse_env_file(m, NEWLINE, "CGROUP", &root, NULL);
+ r = parse_env_file(m, NEWLINE, "SCOPE", &scope, NULL);
+ if (r < 0) {
+ log_error_errno(r, "Failed to get machine path: %m");
+ goto finish;
+ }
+
+ path = unit_dbus_path_from_name(scope);
+ if (!path) {
+ log_oom();
+ goto finish;
+ }
+
+ r = sd_bus_get_property(
+ bus,
+ "org.freedesktop.systemd1",
+ path,
+ "org.freedesktop.systemd1.Scope",
+ "ControlGroup",
+ &error,
+ &reply,
+ "s");
+
+ if (r < 0) {
+ log_error("Failed to query ControlGroup: %s", bus_error_message(&error, -r));
+ goto finish;
+ }
+
+ r = sd_bus_message_read(reply, "s", &cgroup);
+ if (r < 0) {
+ bus_log_parse_error(r);
+ goto finish;
+ }
+
+ root = strdup(cgroup);
+ if (!root) {
+ log_oom();
+ goto finish;
+ }
+
} else
r = cg_get_root_path(&root);
if (r < 0) {
- log_error("Failed to get %s path: %s",
- arg_machine ? "machine" : "root", strerror(-r));
+ log_error_errno(r, "Failed to get %s path: %m",
+ arg_machine ? "machine" : "root");
goto finish;
}
}
if (r < 0) {
- log_error("Failed to list cgroup tree %s: %s", root, strerror(-r));
+ log_error_errno(r, "Failed to list cgroup tree %s: %m", root);
retval = EXIT_FAILURE;
} else
retval = EXIT_SUCCESS;