X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fanalyze%2Fanalyze.c;h=591b4ab14e74a73a1681f9ce4ae681f0b9811cba;hp=0cc4de76cd823bbd2cb1408cb36037155f8428a6;hb=2404701e679904979751816930101511d8ec5d49;hpb=b0770377ab844f92f336837d63f158b954300d2e diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 0cc4de76c..591b4ab14 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -25,11 +25,12 @@ #include #include #include -#include +#include "sd-bus.h" +#include "bus-util.h" +#include "bus-error.h" #include "install.h" #include "log.h" -#include "dbus-common.h" #include "build.h" #include "util.h" #include "strxcpyx.h" @@ -39,9 +40,10 @@ #include "special.h" #include "hashmap.h" #include "pager.h" +#include "analyze-verify.h" #define SCALE_X (0.1 / 1000.0) /* pixels per us */ -#define SCALE_Y 20.0 +#define SCALE_Y (20.0) #define compare(a, b) (((a) > (b))? 1 : (((b) > (a))? -1 : 0)) @@ -60,7 +62,6 @@ svg("\n"); \ } while(false) -static UnitFileScope arg_scope = UNIT_FILE_SYSTEM; static enum dot { DEP_ALL, DEP_ORDER, @@ -70,6 +71,10 @@ static char** arg_dot_from_patterns = NULL; static char** arg_dot_to_patterns = NULL; static usec_t arg_fuzz = 0; static bool arg_no_pager = false; +static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; +static char *arg_host = NULL; +static bool arg_user = false; +static bool arg_man = true; struct boot_times { usec_t firmware_time; @@ -79,6 +84,8 @@ struct boot_times { usec_t initrd_time; usec_t userspace_time; usec_t finish_time; + usec_t security_start_time; + usec_t security_finish_time; usec_t generators_start_time; usec_t generators_finish_time; usec_t unitsload_start_time; @@ -87,13 +94,23 @@ struct boot_times { struct unit_times { char *name; - usec_t ixt; - usec_t iet; - usec_t axt; - usec_t aet; + usec_t activating; + usec_t activated; + usec_t deactivated; + usec_t deactivating; usec_t time; }; +struct host_info { + char *hostname; + char *kernel_name; + char *kernel_release; + char *kernel_version; + char *os_pretty_name; + char *virtualization; + char *architecture; +}; + static void pager_open_if_enabled(void) { if (arg_no_pager) @@ -102,39 +119,54 @@ static void pager_open_if_enabled(void) { pager_open(false); } -static int bus_get_uint64_property(DBusConnection *bus, const char *path, const char *interface, const char *property, uint64_t *val) { - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - DBusMessageIter iter, sub; +static int bus_get_uint64_property(sd_bus *bus, const char *path, const char *interface, const char *property, uint64_t *val) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; - r = bus_method_call_with_reply( + assert(bus); + assert(path); + assert(interface); + assert(property); + assert(val); + + r = sd_bus_get_property_trivial( bus, "org.freedesktop.systemd1", path, - "org.freedesktop.DBus.Properties", - "Get", - &reply, - NULL, - DBUS_TYPE_STRING, &interface, - DBUS_TYPE_STRING, &property, - DBUS_TYPE_INVALID); - if (r < 0) - return r; + interface, + property, + &error, + 't', val); - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) { - log_error("Failed to parse reply."); - return -EIO; + if (r < 0) { + log_error("Failed to parse reply: %s", bus_error_message(&error, -r)); + return r; } - dbus_message_iter_recurse(&iter, &sub); + return 0; +} - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_UINT64) { - log_error("Failed to parse reply."); - return -EIO; - } +static int bus_get_unit_property_strv(sd_bus *bus, const char *path, const char *property, char ***strv) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + int r; - dbus_message_iter_get_basic(&sub, val); + assert(bus); + assert(path); + assert(property); + assert(strv); + + r = sd_bus_get_property_strv( + bus, + "org.freedesktop.systemd1", + path, + "org.freedesktop.systemd1.Unit", + property, + &error, + strv); + if (r < 0) { + log_error("Failed to get unit property %s: %s", property, bus_error_message(&error, -r)); + return r; + } return 0; } @@ -145,23 +177,8 @@ static int compare_unit_time(const void *a, const void *b) { } static int compare_unit_start(const void *a, const void *b) { - return compare(((struct unit_times *)a)->ixt, - ((struct unit_times *)b)->ixt); -} - -static int get_os_name(char **_n) { - char *n = NULL; - int r; - - r = parse_env_file("/etc/os-release", NEWLINE, "PRETTY_NAME", &n, NULL); - if (r < 0) - return r; - - if (!n) - return -ENOENT; - - *_n = n; - return 0; + return compare(((struct unit_times *)a)->activating, + ((struct unit_times *)b)->activating); } static void free_unit_times(struct unit_times *t, unsigned n) { @@ -173,94 +190,74 @@ static void free_unit_times(struct unit_times *t, unsigned n) { free(t); } -static int acquire_time_data(DBusConnection *bus, struct unit_times **out) { - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - DBusMessageIter iter, sub; - int r, c = 0, n_units = 0; +static int acquire_time_data(sd_bus *bus, struct unit_times **out) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + int r, c = 0; struct unit_times *unit_times = NULL; + size_t size = 0; + UnitInfo u; - r = bus_method_call_with_reply( + r = sd_bus_call_method( bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "ListUnits", - &reply, - NULL, - DBUS_TYPE_INVALID); - if (r < 0) + &error, &reply, + NULL); + if (r < 0) { + log_error("Failed to list units: %s", bus_error_message(&error, -r)); goto fail; + } - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY || - dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_STRUCT) { - log_error("Failed to parse reply."); - r = -EIO; + r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssssouso)"); + if (r < 0) { + bus_log_parse_error(r); goto fail; } - for (dbus_message_iter_recurse(&iter, &sub); - dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID; - dbus_message_iter_next(&sub)) { - struct unit_info u; + while ((r = bus_parse_unit_info(reply, &u)) > 0) { struct unit_times *t; - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) { - log_error("Failed to parse reply."); - r = -EIO; + if (!GREEDY_REALLOC(unit_times, size, c+1)) { + r = log_oom(); goto fail; } - if (c >= n_units) { - struct unit_times *w; - - n_units = MAX(2*c, 16); - w = realloc(unit_times, sizeof(struct unit_times) * n_units); - - if (!w) { - r = log_oom(); - goto fail; - } - - unit_times = w; - } t = unit_times+c; t->name = NULL; - r = bus_parse_unit_info(&sub, &u); - if (r < 0) - goto fail; - assert_cc(sizeof(usec_t) == sizeof(uint64_t)); if (bus_get_uint64_property(bus, u.unit_path, "org.freedesktop.systemd1.Unit", "InactiveExitTimestampMonotonic", - &t->ixt) < 0 || + &t->activating) < 0 || bus_get_uint64_property(bus, u.unit_path, "org.freedesktop.systemd1.Unit", "ActiveEnterTimestampMonotonic", - &t->aet) < 0 || + &t->activated) < 0 || bus_get_uint64_property(bus, u.unit_path, "org.freedesktop.systemd1.Unit", "ActiveExitTimestampMonotonic", - &t->axt) < 0 || + &t->deactivating) < 0 || bus_get_uint64_property(bus, u.unit_path, "org.freedesktop.systemd1.Unit", "InactiveEnterTimestampMonotonic", - &t->iet) < 0) { + &t->deactivated) < 0) { r = -EIO; goto fail; } - if (t->aet >= t->ixt) - t->time = t->aet - t->ixt; - else if (t->iet >= t->ixt) - t->time = t->iet - t->ixt; + if (t->activated >= t->activating) + t->time = t->activated - t->activating; + else if (t->deactivated >= t->activating) + t->time = t->deactivated - t->activating; else t->time = 0; - if (t->ixt == 0) + if (t->activating == 0) continue; t->name = strdup(u.id); @@ -270,16 +267,21 @@ static int acquire_time_data(DBusConnection *bus, struct unit_times **out) { } c++; } + if (r < 0) { + bus_log_parse_error(r); + goto fail; + } *out = unit_times; return c; fail: - free_unit_times(unit_times, (unsigned) c); + if (unit_times) + free_unit_times(unit_times, (unsigned) c); return r; } -static int acquire_boot_times(DBusConnection *bus, struct boot_times **bt) { +static int acquire_boot_times(sd_bus *bus, struct boot_times **bt) { static struct boot_times times; static bool cached = false; @@ -318,6 +320,16 @@ static int acquire_boot_times(DBusConnection *bus, struct boot_times **bt) { "org.freedesktop.systemd1.Manager", "FinishTimestampMonotonic", ×.finish_time) < 0 || + bus_get_uint64_property(bus, + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "SecurityStartTimestampMonotonic", + ×.security_start_time) < 0 || + bus_get_uint64_property(bus, + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "SecurityFinishTimestampMonotonic", + ×.security_finish_time) < 0 || bus_get_uint64_property(bus, "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", @@ -342,7 +354,7 @@ static int acquire_boot_times(DBusConnection *bus, struct boot_times **bt) { if (times.finish_time <= 0) { log_error("Bootup is not yet finished. Please try again later."); - return -EAGAIN; + return -EINPROGRESS; } if (times.initrd_time) @@ -357,7 +369,64 @@ finish: return 0; } -static int pretty_boot_time(DBusConnection *bus, char **_buf) { +static void free_host_info(struct host_info *hi) { + free(hi->hostname); + free(hi->kernel_name); + free(hi->kernel_release); + free(hi->kernel_version); + free(hi->os_pretty_name); + free(hi->virtualization); + free(hi->architecture); + free(hi); +} + +static int acquire_host_info(sd_bus *bus, struct host_info **hi) { + int r; + struct host_info *host; + + static const struct bus_properties_map hostname_map[] = { + { "Hostname", "s", NULL, offsetof(struct host_info, hostname) }, + { "KernelName", "s", NULL, offsetof(struct host_info, kernel_name) }, + { "KernelRelease", "s", NULL, offsetof(struct host_info, kernel_release) }, + { "KernelVersion", "s", NULL, offsetof(struct host_info, kernel_version) }, + { "OperatingSystemPrettyName", "s", NULL, offsetof(struct host_info, os_pretty_name) }, + {} + }; + + static const struct bus_properties_map manager_map[] = { + { "Virtualization", "s", NULL, offsetof(struct host_info, virtualization) }, + { "Architecture", "s", NULL, offsetof(struct host_info, architecture) }, + {} + }; + + host = new0(struct host_info, 1); + if (!host) + return log_oom(); + + r = bus_map_all_properties(bus, + "org.freedesktop.hostname1", + "/org/freedesktop/hostname1", + hostname_map, + host); + if (r < 0) + goto fail; + + r = bus_map_all_properties(bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + manager_map, + host); + if (r < 0) + goto fail; + + *hi = host; + return 0; +fail: + free_host_info(host); + return r; +} + +static int pretty_boot_time(sd_bus *bus, char **_buf) { char ts[FORMAT_TIMESPAN_MAX]; struct boot_times *t; static char buf[4096]; @@ -419,13 +488,13 @@ static void svg_graph_box(double height, double begin, double end) { } } -static int analyze_plot(DBusConnection *bus) { +static int analyze_plot(sd_bus *bus) { struct unit_times *times; struct boot_times *boot; - struct utsname name; + struct host_info *host = NULL; int n, m = 1, y=0; double width; - _cleanup_free_ char *pretty_times = NULL, *osname = NULL; + _cleanup_free_ char *pretty_times = NULL; struct unit_times *u; n = acquire_boot_times(bus, &boot); @@ -436,12 +505,13 @@ static int analyze_plot(DBusConnection *bus) { if (n < 0) return n; - get_os_name(&osname); - assert_se(uname(&name) >= 0); + n = acquire_host_info(bus, &host); + if (n < 0) + return n; n = acquire_time_data(bus, ×); if (n <= 0) - return n; + goto out; qsort(times, n, sizeof(struct unit_times), compare_unit_start); @@ -462,28 +532,32 @@ static int analyze_plot(DBusConnection *bus) { m++; for (u = times; u < times + n; u++) { - double len; + double text_start, text_width; - if (u->ixt < boot->userspace_time || - u->ixt > boot->finish_time) { + if (u->activating < boot->userspace_time || + u->activating > boot->finish_time) { free(u->name); u->name = NULL; continue; } - len = ((boot->firmware_time + u->ixt) * SCALE_X) - + (10.0 * strlen(u->name)); - if (len > width) - width = len; - - if (u->iet > u->ixt && u->iet <= boot->finish_time - && u->aet == 0 && u->axt == 0) - u->aet = u->axt = u->iet; - if (u->aet < u->ixt || u->aet > boot->finish_time) - u->aet = boot->finish_time; - if (u->axt < u->aet || u->aet > boot->finish_time) - u->axt = boot->finish_time; - if (u->iet < u->axt || u->iet > boot->finish_time) - u->iet = boot->finish_time; + + /* If the text cannot fit on the left side then + * increase the svg width so it fits on the right. + * TODO: calculate the text width more accurately */ + text_width = 8.0 * strlen(u->name); + text_start = (boot->firmware_time + u->activating) * SCALE_X; + if (text_width > text_start && text_width + text_start > width) + width = text_width + text_start; + + if (u->deactivated > u->activating && u->deactivated <= boot->finish_time + && u->activated == 0 && u->deactivating == 0) + u->activated = u->deactivating = u->deactivated; + if (u->activated < u->activating || u->activated > boot->finish_time) + u->activated = boot->finish_time; + if (u->deactivating < u->activated || u->activated > boot->finish_time) + u->deactivating = boot->finish_time; + if (u->deactivated < u->deactivating || u->deactivated > boot->finish_time) + u->deactivated = boot->finish_time; m++; } @@ -516,6 +590,7 @@ static int analyze_plot(DBusConnection *bus) { " rect.firmware { fill: rgb(150,150,150); fill-opacity: 0.7; }\n" " rect.loader { fill: rgb(150,150,150); fill-opacity: 0.7; }\n" " rect.userspace { fill: rgb(150,150,150); fill-opacity: 0.7; }\n" + " rect.security { fill: rgb(144,238,144); fill-opacity: 0.7; }\n" " rect.generators { fill: rgb(102,204,255); fill-opacity: 0.7; }\n" " rect.unitsload { fill: rgb( 82,184,255); fill-opacity: 0.7; }\n" " rect.box { fill: rgb(240,240,240); stroke: rgb(192,192,192); }\n" @@ -531,12 +606,17 @@ static int analyze_plot(DBusConnection *bus) { svg("\n"); svg("%s", pretty_times); - svg("%s %s (%s %s) %s", - isempty(osname) ? "Linux" : osname, - name.nodename, name.release, name.version, name.machine); + svg("%s %s (%s %s %s) %s %s", + isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name, + isempty(host->hostname) ? "" : host->hostname, + isempty(host->kernel_name) ? "" : host->kernel_name, + isempty(host->kernel_release) ? "" : host->kernel_release, + isempty(host->kernel_version) ? "" : host->kernel_version, + isempty(host->architecture) ? "" : host->architecture, + isempty(host->virtualization) ? "" : host->virtualization); svg("\n", 20.0 + (SCALE_X * boot->firmware_time)); - svg_graph_box(m, -boot->firmware_time, boot->finish_time); + svg_graph_box(m, -(double) boot->firmware_time, boot->finish_time); if (boot->firmware_time) { svg_bar("firmware", -(double) boot->firmware_time, -(double) boot->loader_time, y); @@ -559,9 +639,10 @@ static int analyze_plot(DBusConnection *bus) { y++; } svg_bar("active", boot->userspace_time, boot->finish_time, y); + svg_bar("security", boot->security_start_time, boot->security_finish_time, y); svg_bar("generators", boot->generators_start_time, boot->generators_finish_time, y); svg_bar("unitsload", boot->unitsload_start_time, boot->unitsload_finish_time, y); - svg_text("left", boot->userspace_time, y, "systemd"); + svg_text(true, boot->userspace_time, y, "systemd"); y++; for (u = times; u < times + n; u++) { @@ -571,44 +652,54 @@ static int analyze_plot(DBusConnection *bus) { if (!u->name) continue; - svg_bar("activating", u->ixt, u->aet, y); - svg_bar("active", u->aet, u->axt, y); - svg_bar("deactivating", u->axt, u->iet, y); + svg_bar("activating", u->activating, u->activated, y); + svg_bar("active", u->activated, u->deactivating, y); + svg_bar("deactivating", u->deactivating, u->deactivated, y); - b = u->ixt * SCALE_X > width * 2 / 3; + /* place the text on the left if we have passed the half of the svg width */ + b = u->activating * SCALE_X < width / 2; if (u->time) - svg_text(b, u->ixt, y, "%s (%s)", + svg_text(b, u->activating, y, "%s (%s)", u->name, format_timespan(ts, sizeof(ts), u->time, USEC_PER_MSEC)); else - svg_text(b, u->ixt, y, "%s", u->name); + svg_text(b, u->activating, y, "%s", u->name); y++; } + svg("\n"); + /* Legend */ + svg("\n"); y++; svg_bar("activating", 0, 300000, y); - svg_text("right", 400000, y, "Activating"); + svg_text(true, 400000, y, "Activating"); y++; svg_bar("active", 0, 300000, y); - svg_text("right", 400000, y, "Active"); + svg_text(true, 400000, y, "Active"); y++; svg_bar("deactivating", 0, 300000, y); - svg_text("right", 400000, y, "Deactivating"); + svg_text(true, 400000, y, "Deactivating"); + y++; + svg_bar("security", 0, 300000, y); + svg_text(true, 400000, y, "Setting up security module"); y++; svg_bar("generators", 0, 300000, y); - svg_text("right", 400000, y, "Generators"); + svg_text(true, 400000, y, "Generators"); y++; svg_bar("unitsload", 0, 300000, y); - svg_text("right", 400000, y, "Loading unit files"); + svg_text(true, 400000, y, "Loading unit files"); y++; svg("\n\n"); - svg(""); + svg("\n"); free_unit_times(times, (unsigned) n); - return 0; + n = 0; +out: + free_host_info(host); + return n; } static int list_dependencies_print(const char *name, unsigned int level, unsigned int branches, @@ -617,123 +708,38 @@ static int list_dependencies_print(const char *name, unsigned int level, unsigne char ts[FORMAT_TIMESPAN_MAX], ts2[FORMAT_TIMESPAN_MAX]; for (i = level; i != 0; i--) - printf("%s", draw_special_char(branches & (1 << (i-1)) ? DRAW_TREE_VERT : DRAW_TREE_SPACE)); + printf("%s", draw_special_char(branches & (1 << (i-1)) ? DRAW_TREE_VERTICAL : DRAW_TREE_SPACE)); printf("%s", draw_special_char(last ? DRAW_TREE_RIGHT : DRAW_TREE_BRANCH)); if (times) { if (times->time) printf("%s%s @%s +%s%s", ANSI_HIGHLIGHT_RED_ON, name, - format_timespan(ts, sizeof(ts), times->ixt - boot->userspace_time, USEC_PER_MSEC), + format_timespan(ts, sizeof(ts), times->activating - boot->userspace_time, USEC_PER_MSEC), format_timespan(ts2, sizeof(ts2), times->time, USEC_PER_MSEC), ANSI_HIGHLIGHT_OFF); - else if (times->aet > boot->userspace_time) - printf("%s @%s", name, format_timespan(ts, sizeof(ts), times->aet - boot->userspace_time, USEC_PER_MSEC)); + else if (times->activated > boot->userspace_time) + printf("%s @%s", name, format_timespan(ts, sizeof(ts), times->activated - boot->userspace_time, USEC_PER_MSEC)); else printf("%s", name); - } else printf("%s", name); + } else + printf("%s", name); printf("\n"); return 0; } -static int list_dependencies_get_dependencies(DBusConnection *bus, const char *name, char ***deps) { - static const char dependencies[] = - "After\0"; - - _cleanup_free_ char *path; - const char *interface = "org.freedesktop.systemd1.Unit"; - - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - DBusMessageIter iter, sub, sub2, sub3; - - int r = 0; - char **ret = NULL; +static int list_dependencies_get_dependencies(sd_bus *bus, const char *name, char ***deps) { + _cleanup_free_ char *path = NULL; assert(bus); assert(name); assert(deps); path = unit_dbus_path_from_name(name); - if (path == NULL) { - r = -EINVAL; - goto finish; - } - - r = bus_method_call_with_reply( - bus, - "org.freedesktop.systemd1", - path, - "org.freedesktop.DBus.Properties", - "GetAll", - &reply, - NULL, - DBUS_TYPE_STRING, &interface, - DBUS_TYPE_INVALID); - if (r < 0) - goto finish; - - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY || - dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_DICT_ENTRY) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; - } - - dbus_message_iter_recurse(&iter, &sub); - - while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { - const char *prop; - - assert(dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_DICT_ENTRY); - dbus_message_iter_recurse(&sub, &sub2); - - if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &prop, true) < 0) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; - } - - if (dbus_message_iter_get_arg_type(&sub2) != DBUS_TYPE_VARIANT) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; - } - - dbus_message_iter_recurse(&sub2, &sub3); - dbus_message_iter_next(&sub); - - if (!nulstr_contains(dependencies, prop)) - continue; - - if (dbus_message_iter_get_arg_type(&sub3) == DBUS_TYPE_ARRAY) { - if (dbus_message_iter_get_element_type(&sub3) == DBUS_TYPE_STRING) { - DBusMessageIter sub4; - dbus_message_iter_recurse(&sub3, &sub4); - - while (dbus_message_iter_get_arg_type(&sub4) != DBUS_TYPE_INVALID) { - const char *s; - - assert(dbus_message_iter_get_arg_type(&sub4) == DBUS_TYPE_STRING); - dbus_message_iter_get_basic(&sub4, &s); - - r = strv_extend(&ret, s); - if (r < 0) { - log_oom(); - goto finish; - } + if (path == NULL) + return -ENOMEM; - dbus_message_iter_next(&sub4); - } - } - } - } -finish: - if (r < 0) - strv_free(ret); - else - *deps = ret; - return r; + return bus_get_unit_property_strv(bus, path, "After", deps); } static Hashmap *unit_times_hashmap; @@ -745,15 +751,15 @@ static int list_dependencies_compare(const void *_a, const void *_b) { times = hashmap_get(unit_times_hashmap, *a); if (times) - usa = times->aet; + usa = times->activated; times = hashmap_get(unit_times_hashmap, *b); if (times) - usb = times->aet; + usb = times->activated; return usb - usa; } -static int list_dependencies_one(DBusConnection *bus, const char *name, unsigned int level, char ***units, +static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int level, char ***units, unsigned int branches) { _cleanup_strv_free_ char **deps = NULL; char **c; @@ -763,7 +769,7 @@ static int list_dependencies_one(DBusConnection *bus, const char *name, unsigned struct unit_times *times; struct boot_times *boot; - if(strv_extend(units, name)) + if (strv_extend(units, name)) return log_oom(); r = list_dependencies_get_dependencies(bus, name, &deps); @@ -779,11 +785,11 @@ static int list_dependencies_one(DBusConnection *bus, const char *name, unsigned STRV_FOREACH(c, deps) { times = hashmap_get(unit_times_hashmap, *c); if (times - && times->aet - && times->aet <= boot->finish_time - && (times->aet >= service_longest + && times->activated + && times->activated <= boot->finish_time + && (times->activated >= service_longest || service_longest == 0)) { - service_longest = times->aet; + service_longest = times->activated; break; } } @@ -793,22 +799,22 @@ static int list_dependencies_one(DBusConnection *bus, const char *name, unsigned STRV_FOREACH(c, deps) { times = hashmap_get(unit_times_hashmap, *c); - if (times && times->aet - && times->aet <= boot->finish_time - && (service_longest - times->aet) <= arg_fuzz) { + if (times && times->activated + && times->activated <= boot->finish_time + && (service_longest - times->activated) <= arg_fuzz) { to_print++; } } - if(!to_print) + if (!to_print) return r; STRV_FOREACH(c, deps) { times = hashmap_get(unit_times_hashmap, *c); if (!times - || !times->aet - || times->aet > boot->finish_time - || service_longest - times->aet > arg_fuzz) + || !times->activated + || times->activated > boot->finish_time + || service_longest - times->activated > arg_fuzz) continue; to_print--; @@ -836,53 +842,40 @@ static int list_dependencies_one(DBusConnection *bus, const char *name, unsigned return 0; } -static int list_dependencies(DBusConnection *bus, const char *name) { +static int list_dependencies(sd_bus *bus, const char *name) { _cleanup_strv_free_ char **units = NULL; char ts[FORMAT_TIMESPAN_MAX]; struct unit_times *times; int r; - const char - *path, *id, - *interface = "org.freedesktop.systemd1.Unit", - *property = "Id"; - DBusMessageIter iter, sub; - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; + const char *id; + _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; struct boot_times *boot; assert(bus); path = unit_dbus_path_from_name(name); if (path == NULL) - return -EINVAL; + return -ENOMEM; - r = bus_method_call_with_reply ( + r = sd_bus_get_property( bus, "org.freedesktop.systemd1", path, - "org.freedesktop.DBus.Properties", - "Get", + "org.freedesktop.systemd1.Unit", + "Id", + &error, &reply, - NULL, - DBUS_TYPE_STRING, &interface, - DBUS_TYPE_STRING, &property, - DBUS_TYPE_INVALID); - if (r < 0) + "s"); + if (r < 0) { + log_error("Failed to get ID: %s", bus_error_message(&error, -r)); return r; - - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) { - log_error("Failed to parse reply."); - return -EIO; } - dbus_message_iter_recurse(&iter, &sub); - - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING) { - log_error("Failed to parse reply."); - return -EIO; - } - - dbus_message_iter_get_basic(&sub, &id); + r = sd_bus_message_read(reply, "s", &id); + if (r < 0) + return bus_log_parse_error(r); times = hashmap_get(unit_times_hashmap, id); @@ -894,8 +887,8 @@ static int list_dependencies(DBusConnection *bus, const char *name) { if (times->time) printf("%s%s +%s%s\n", ANSI_HIGHLIGHT_RED_ON, id, format_timespan(ts, sizeof(ts), times->time, USEC_PER_MSEC), ANSI_HIGHLIGHT_OFF); - else if (times->aet > boot->userspace_time) - printf("%s @%s\n", id, format_timespan(ts, sizeof(ts), times->aet - boot->userspace_time, USEC_PER_MSEC)); + else if (times->activated > boot->userspace_time) + printf("%s @%s\n", id, format_timespan(ts, sizeof(ts), times->activated - boot->userspace_time, USEC_PER_MSEC)); else printf("%s\n", id); } @@ -903,17 +896,17 @@ static int list_dependencies(DBusConnection *bus, const char *name) { return list_dependencies_one(bus, name, 0, &units, 0); } -static int analyze_critical_chain(DBusConnection *bus, char *names[]) { +static int analyze_critical_chain(sd_bus *bus, char *names[]) { struct unit_times *times; - int n, r; unsigned int i; Hashmap *h; + int n, r; n = acquire_time_data(bus, ×); if (n <= 0) return n; - h = hashmap_new(string_hash_func, string_compare_func); + h = hashmap_new(&string_hash_ops); if (!h) return -ENOMEM; @@ -941,7 +934,7 @@ static int analyze_critical_chain(DBusConnection *bus, char *names[]) { return 0; } -static int analyze_blame(DBusConnection *bus) { +static int analyze_blame(sd_bus *bus) { struct unit_times *times; unsigned i; int n; @@ -965,7 +958,7 @@ static int analyze_blame(DBusConnection *bus) { return 0; } -static int analyze_time(DBusConnection *bus) { +static int analyze_time(sd_bus *bus) { _cleanup_free_ char *buf = NULL; int r; @@ -977,145 +970,75 @@ static int analyze_time(DBusConnection *bus) { return 0; } -static int graph_one_property(const char *name, const char *prop, DBusMessageIter *iter, char* patterns[]) { - - static const char * const colors[] = { - "Requires", "[color=\"black\"]", - "RequiresOverridable", "[color=\"black\"]", - "Requisite", "[color=\"darkblue\"]", - "RequisiteOverridable", "[color=\"darkblue\"]", - "Wants", "[color=\"grey66\"]", - "Conflicts", "[color=\"red\"]", - "ConflictedBy", "[color=\"red\"]", - "After", "[color=\"green\"]" - }; - - const char *c = NULL; - unsigned i; +static int graph_one_property(sd_bus *bus, const UnitInfo *u, const char* prop, const char *color, char* patterns[]) { + _cleanup_strv_free_ char **units = NULL; + char **unit; + int r; + bool match_patterns; - assert(name); + assert(u); assert(prop); - assert(iter); - - for (i = 0; i < ELEMENTSOF(colors); i += 2) - if (streq(colors[i], prop)) { - c = colors[i+1]; - break; - } + assert(color); - if (!c) - return 0; + match_patterns = strv_fnmatch(patterns, u->id, 0); - if (arg_dot != DEP_ALL) - if ((arg_dot == DEP_ORDER) != streq(prop, "After")) + if (!strv_isempty(arg_dot_from_patterns) && + !match_patterns && + !strv_fnmatch(arg_dot_from_patterns, u->id, 0)) return 0; - if (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_ARRAY && - dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRING) { - DBusMessageIter sub; - - dbus_message_iter_recurse(iter, &sub); - - for (dbus_message_iter_recurse(iter, &sub); - dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID; - dbus_message_iter_next(&sub)) { - const char *s; - char **p; - bool match_found; - - assert(dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING); - dbus_message_iter_get_basic(&sub, &s); - - if (!strv_isempty(arg_dot_from_patterns)) { - match_found = false; - - STRV_FOREACH(p, arg_dot_from_patterns) - if (fnmatch(*p, name, 0) == 0) { - match_found = true; - break; - } - - if (!match_found) - continue; - } - - if (!strv_isempty(arg_dot_to_patterns)) { - match_found = false; - - STRV_FOREACH(p, arg_dot_to_patterns) - if (fnmatch(*p, s, 0) == 0) { - match_found = true; - break; - } - - if (!match_found) - continue; - } - - if (!strv_isempty(patterns)) { - match_found = false; - - STRV_FOREACH(p, patterns) - if (fnmatch(*p, name, 0) == 0 || fnmatch(*p, s, 0) == 0) { - match_found = true; - break; - } - if (!match_found) - continue; - } - - printf("\t\"%s\"->\"%s\" %s;\n", name, s, c); - } + r = bus_get_unit_property_strv(bus, u->unit_path, prop, &units); + if (r < 0) + return r; + + STRV_FOREACH(unit, units) { + bool match_patterns2; + + match_patterns2 = strv_fnmatch(patterns, *unit, 0); + + if (!strv_isempty(arg_dot_to_patterns) && + !match_patterns2 && + !strv_fnmatch(arg_dot_to_patterns, *unit, 0)) + continue; + + if (!strv_isempty(patterns) && !match_patterns && !match_patterns2) + continue; + + printf("\t\"%s\"->\"%s\" [color=\"%s\"];\n", u->id, *unit, color); } return 0; } -static int graph_one(DBusConnection *bus, const struct unit_info *u, char *patterns[]) { - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - const char *interface = "org.freedesktop.systemd1.Unit"; +static int graph_one(sd_bus *bus, const UnitInfo *u, char *patterns[]) { int r; - DBusMessageIter iter, sub, sub2, sub3; assert(bus); assert(u); - r = bus_method_call_with_reply( - bus, - "org.freedesktop.systemd1", - u->unit_path, - "org.freedesktop.DBus.Properties", - "GetAll", - &reply, - NULL, - DBUS_TYPE_STRING, &interface, - DBUS_TYPE_INVALID); - if (r < 0) - return r; - - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY || - dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_DICT_ENTRY) { - log_error("Failed to parse reply."); - return -EIO; + if (arg_dot == DEP_ORDER ||arg_dot == DEP_ALL) { + r = graph_one_property(bus, u, "After", "green", patterns); + if (r < 0) + return r; } - for (dbus_message_iter_recurse(&iter, &sub); - dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID; - dbus_message_iter_next(&sub)) { - const char *prop; - - assert(dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_DICT_ENTRY); - dbus_message_iter_recurse(&sub, &sub2); - - if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &prop, true) < 0 || - dbus_message_iter_get_arg_type(&sub2) != DBUS_TYPE_VARIANT) { - log_error("Failed to parse reply."); - return -EIO; - } - - dbus_message_iter_recurse(&sub2, &sub3); - r = graph_one_property(u->id, prop, &sub3, patterns); + if (arg_dot == DEP_REQUIRE ||arg_dot == DEP_ALL) { + r = graph_one_property(bus, u, "Requires", "black", patterns); + if (r < 0) + return r; + r = graph_one_property(bus, u, "RequiresOverridable", "black", patterns); + if (r < 0) + return r; + r = graph_one_property(bus, u, "RequisiteOverridable", "darkblue", patterns); + if (r < 0) + return r; + r = graph_one_property(bus, u, "Wants", "grey66", patterns); + if (r < 0) + return r; + r = graph_one_property(bus, u, "Conflicts", "red", patterns); + if (r < 0) + return r; + r = graph_one_property(bus, u, "ConflictedBy", "red", patterns); if (r < 0) return r; } @@ -1123,45 +1046,40 @@ static int graph_one(DBusConnection *bus, const struct unit_info *u, char *patte return 0; } -static int dot(DBusConnection *bus, char* patterns[]) { - _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; - DBusMessageIter iter, sub; +static int dot(sd_bus *bus, char* patterns[]) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; + UnitInfo u; - r = bus_method_call_with_reply( + r = sd_bus_call_method( bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "ListUnits", - &reply, - NULL, - DBUS_TYPE_INVALID); - if (r < 0) + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "ListUnits", + &error, + &reply, + ""); + if (r < 0) { + log_error("Failed to list units: %s", bus_error_message(&error, -r)); return r; - - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY || - dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_STRUCT) { - log_error("Failed to parse reply."); - return -EIO; } - printf("digraph systemd {\n"); + r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssssouso)"); + if (r < 0) + return bus_log_parse_error(r); - for (dbus_message_iter_recurse(&iter, &sub); - dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID; - dbus_message_iter_next(&sub)) { - struct unit_info u; + printf("digraph systemd {\n"); - r = bus_parse_unit_info(&sub, &u); - if (r < 0) - return -EIO; + while ((r = bus_parse_unit_info(reply, &u)) > 0) { r = graph_one(bus, &u, patterns); if (r < 0) return r; } + if (r < 0) + return bus_log_parse_error(r); printf("}\n"); @@ -1178,13 +1096,11 @@ static int dot(DBusConnection *bus, char* patterns[]) { return 0; } -static int dump(DBusConnection *bus, char **args) { - _cleanup_free_ DBusMessage *reply = NULL; - DBusError error; +static int dump(sd_bus *bus, char **args) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + const char *text = NULL; int r; - const char *text; - - dbus_error_init(&error); if (!strv_isempty(args)) { log_error("Too many arguments."); @@ -1193,37 +1109,31 @@ static int dump(DBusConnection *bus, char **args) { pager_open_if_enabled(); - r = bus_method_call_with_reply( + r = sd_bus_call_method( bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "Dump", - &reply, - NULL, - DBUS_TYPE_INVALID); - if (r < 0) + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "Dump", + &error, + &reply, + ""); + if (r < 0) { + log_error("Failed issue method call: %s", bus_error_message(&error, -r)); return r; - - if (!dbus_message_get_args(reply, &error, - DBUS_TYPE_STRING, &text, - DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", bus_error_message(&error)); - dbus_error_free(&error); - return -EIO; } + r = sd_bus_message_read(reply, "s", &text); + if (r < 0) + return bus_log_parse_error(r); + fputs(text, stdout); return 0; } -static int set_log_level(DBusConnection *bus, char **args) { - _cleanup_dbus_error_free_ DBusError error; - _cleanup_dbus_message_unref_ DBusMessage *m = NULL, *reply = NULL; - DBusMessageIter iter, sub; - const char* property = "LogLevel"; - const char* interface = "org.freedesktop.systemd1.Manager"; - const char* value; +static int set_log_level(sd_bus *bus, char **args) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + int r; assert(bus); assert(args); @@ -1233,76 +1143,60 @@ static int set_log_level(DBusConnection *bus, char **args) { return -E2BIG; } - value = args[0]; - dbus_error_init(&error); - - m = dbus_message_new_method_call("org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.DBus.Properties", - "Set"); - if (!m) - return log_oom(); - - dbus_message_iter_init_append(m, &iter); - - if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &interface) || - !dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &property) || - !dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, "s", &sub)) - return log_oom(); - - if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &value)) - return log_oom(); - - if (!dbus_message_iter_close_container(&iter, &sub)) - return log_oom(); - - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); - if (!reply) { - log_error("Failed to issue method call: %s", bus_error_message(&error)); + r = sd_bus_set_property( + bus, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "LogLevel", + &error, + "s", + args[0]); + if (r < 0) { + log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); return -EIO; } return 0; } -static void analyze_help(void) { +static void help(void) { pager_open_if_enabled(); printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Process systemd profiling information\n\n" - " -h --help Show this help\n" - " --version Show package version\n" - " --system Connect to system manager\n" - " --user Connect to user service manager\n" - " --order When generating a dependency graph, show only order\n" - " --require When generating a dependency graph, show only requirement\n" - " --from-pattern=GLOB, --to-pattern=GLOB\n" - " When generating a dependency graph, filter only origins\n" - " or destinations, respectively\n" - " --fuzz=TIMESPAN When printing the tree of the critical chain, print also\n" - " services, which finished TIMESPAN earlier, than the\n" - " latest in the branch. The unit of TIMESPAN is seconds\n" - " unless specified with a different unit, i.e. 50ms\n" - " --no-pager Do not pipe output into a pager\n\n" + "Profile systemd, show unit dependencies, check unit files.\n\n" + " -h --help Show this help\n" + " --version Show package version\n" + " --no-pager Do not pipe output into a pager\n" + " --system Operate on system systemd instance\n" + " --user Operate on user systemd instance\n" + " -H --host=[USER@]HOST Operate on remote host\n" + " -M --machine=CONTAINER Operate on local container\n" + " --order Show only order in the graph\n" + " --require Show only requirement in the graph\n" + " --from-pattern=GLOB Show only origins in the graph\n" + " --to-pattern=GLOB Show only destinations in the graph\n" + " --fuzz=SECONDS Also print also services which finished SECONDS\n" + " earlier than the latest in the branch\n" + " --man[=BOOL] Do [not] check for existence of man pages\n\n" "Commands:\n" - " time Print time spent in the kernel before reaching userspace\n" - " blame Print list of running units ordered by time to init\n" - " critical-chain Print a tree of the time critical chain of units\n" - " plot Output SVG graphic showing service initialization\n" - " dot Output dependency graph in dot(1) format\n" - " set-log-level LEVEL Set logging threshold for systemd\n" - " dump Output state serialization of service manager\n", - program_invocation_short_name); + " time Print time spent in the kernel\n" + " blame Print list of running units ordered by time to init\n" + " critical-chain Print a tree of the time critical chain of units\n" + " plot Output SVG graphic showing service initialization\n" + " dot Output dependency graph in dot(1) format\n" + " set-log-level LEVEL Set logging threshold for systemd\n" + " dump Output state serialization of service manager\n" + " verify FILE... Check unit files for correctness\n" + , program_invocation_short_name); /* When updating this list, including descriptions, apply - * changes to shell-completion/bash/systemd and - * shell-completion/systemd-zsh-completion.zsh too. */ + * changes to shell-completion/bash/systemd-analyze and + * shell-completion/zsh/_systemd-analyze too. */ } static int parse_argv(int argc, char *argv[]) { - int r; - enum { ARG_VERSION = 0x100, ARG_ORDER, @@ -1312,7 +1206,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_DOT_FROM_PATTERN, ARG_DOT_TO_PATTERN, ARG_FUZZ, - ARG_NO_PAGER + ARG_NO_PAGER, + ARG_MAN, }; static const struct option options[] = { @@ -1326,29 +1221,35 @@ static int parse_argv(int argc, char *argv[]) { { "to-pattern", required_argument, NULL, ARG_DOT_TO_PATTERN }, { "fuzz", required_argument, NULL, ARG_FUZZ }, { "no-pager", no_argument, NULL, ARG_NO_PAGER }, - { NULL, 0, NULL, 0 } + { "man", optional_argument, NULL, ARG_MAN }, + { "host", required_argument, NULL, 'H' }, + { "machine", required_argument, NULL, 'M' }, + {} }; + int r, c; + assert(argc >= 0); assert(argv); - for (;;) { - switch (getopt_long(argc, argv, "h", options, NULL)) { + while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) + switch (c) { case 'h': - analyze_help(); + help(); return 0; case ARG_VERSION: - puts(PACKAGE_STRING "\n" SYSTEMD_FEATURES); + puts(PACKAGE_STRING); + puts(SYSTEMD_FEATURES); return 0; case ARG_USER: - arg_scope = UNIT_FILE_USER; + arg_user = true; break; case ARG_SYSTEM: - arg_scope = UNIT_FILE_SYSTEM; + arg_user = false; break; case ARG_ORDER: @@ -1381,21 +1282,42 @@ static int parse_argv(int argc, char *argv[]) { arg_no_pager = true; break; - case -1: - return 1; + case 'H': + arg_transport = BUS_TRANSPORT_REMOTE; + arg_host = optarg; + break; + + case 'M': + arg_transport = BUS_TRANSPORT_MACHINE; + arg_host = optarg; + break; + + case ARG_MAN: + if (optarg) { + r = parse_boolean(optarg); + if (r < 0) { + log_error("Failed to parse --man= argument."); + return -EINVAL; + } + + arg_man = !!r; + } else + arg_man = true; + + break; case '?': return -EINVAL; default: - assert_not_reached("Unhandled option"); + assert_not_reached("Unhandled option code."); } - } + + return 1; /* work to do */ } int main(int argc, char *argv[]) { int r; - DBusConnection *bus = NULL; setlocale(LC_ALL, ""); setlocale(LC_NUMERIC, "C"); /* we want to format/parse floats in C style */ @@ -1406,30 +1328,36 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; - bus = dbus_bus_get(arg_scope == UNIT_FILE_SYSTEM ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, NULL); - if (!bus) { - r = -EIO; - goto finish; - } + if (streq_ptr(argv[optind], "verify")) + r = verify_units(argv+optind+1, + arg_user ? SYSTEMD_USER : SYSTEMD_SYSTEM, + arg_man); + else { + _cleanup_bus_close_unref_ sd_bus *bus = NULL; - if (!argv[optind] || streq(argv[optind], "time")) - r = analyze_time(bus); - else if (streq(argv[optind], "blame")) - r = analyze_blame(bus); - else if (streq(argv[optind], "critical-chain")) - r = analyze_critical_chain(bus, argv+optind+1); - else if (streq(argv[optind], "plot")) - r = analyze_plot(bus); - else if (streq(argv[optind], "dot")) - r = dot(bus, argv+optind+1); - else if (streq(argv[optind], "dump")) - r = dump(bus, argv+optind+1); - else if (streq(argv[optind], "set-log-level")) - r = set_log_level(bus, argv+optind+1); - else - log_error("Unknown operation '%s'.", argv[optind]); + r = bus_open_transport_systemd(arg_transport, arg_host, arg_user, &bus); + if (r < 0) { + log_error_errno(r, "Failed to create bus connection: %m"); + goto finish; + } - dbus_connection_unref(bus); + if (!argv[optind] || streq(argv[optind], "time")) + r = analyze_time(bus); + else if (streq(argv[optind], "blame")) + r = analyze_blame(bus); + else if (streq(argv[optind], "critical-chain")) + r = analyze_critical_chain(bus, argv+optind+1); + else if (streq(argv[optind], "plot")) + r = analyze_plot(bus); + else if (streq(argv[optind], "dot")) + r = dot(bus, argv+optind+1); + else if (streq(argv[optind], "dump")) + r = dump(bus, argv+optind+1); + else if (streq(argv[optind], "set-log-level")) + r = set_log_level(bus, argv+optind+1); + else + log_error("Unknown operation '%s'.", argv[optind]); + } finish: pager_close();