X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fanalyze%2Fanalyze.c;h=b80b91c5b7483553d31c90043340c5fa0428404f;hp=e278a64d7646ce6d50fe5e4b3eee9357f23fafe5;hb=8fe12d88a8b4d5beb64e5d4efd205043a01b0c13;hpb=cc27380c1e09bd51380fbeb168d8315cc806e0ab diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index e278a64d7..b80b91c5b 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -62,7 +62,6 @@ svg("\n"); \ } while(false) -static UnitFileScope arg_scope = UNIT_FILE_SYSTEM; static enum dot { DEP_ALL, DEP_ORDER, @@ -72,6 +71,9 @@ 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; struct boot_times { usec_t firmware_time; @@ -87,19 +89,6 @@ struct boot_times { usec_t unitsload_finish_time; }; -struct unit_info { - const char *id; - const char *description; - const char *load_state; - const char *active_state; - const char *sub_state; - const char *following; - const char *unit_path; - uint32_t job_id; - const char *job_type; - const char *job_path; -}; - struct unit_times { char *name; usec_t activating; @@ -121,6 +110,12 @@ static int bus_get_uint64_property(sd_bus *bus, const char *path, const char *in _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; + assert(bus); + assert(path); + assert(interface); + assert(property); + assert(val); + r = sd_bus_get_property_trivial( bus, "org.freedesktop.systemd1", @@ -138,6 +133,31 @@ static int bus_get_uint64_property(sd_bus *bus, const char *path, const char *in return 0; } +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; + + 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; +} + static int compare_unit_time(const void *a, const void *b) { return compare(((struct unit_times *)b)->time, ((struct unit_times *)a)->time); @@ -172,109 +192,41 @@ static void free_unit_times(struct unit_times *t, unsigned n) { free(t); } -static int bus_parse_unit_info(sd_bus_message *message, struct unit_info *u) { - int r = 0; - - assert(message); - assert(u); - - r = sd_bus_message_read(message, "(ssssssouso)", &u->id, - &u->description, - &u->load_state, - &u->active_state, - &u->sub_state, - &u->following, - &u->unit_path, - &u->job_id, - &u->job_type, - &u->job_path); - if (r < 0) { - log_error("Failed to parse message as unit_info."); - return -EIO; - } - - return r; -} - -static int bus_get_unit_property_strv(sd_bus *bus, const char *unit_path, const char *prop, char ***strv) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - int r; - const char *s; - - r = sd_bus_get_property( - bus, - "org.freedesktop.systemd1", - unit_path, - "org.freedesktop.systemd1.Unit", - prop, - &error, - &reply, - "as"); - if (r < 0) { - log_error("Failed to get unit property: %s %s", prop, bus_error_message(&error, -r)); - return r; - } - - r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "s"); - if (r < 0) - return r; - - while ((r = sd_bus_message_read(reply, "s", &s)) > 0) { - r = strv_extend(strv, s); - if (r < 0) { - log_oom(); - return r; - } - } - - return r; -} - 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, n_units = 0; + int r, c = 0; struct unit_times *unit_times = NULL; - struct unit_info u; + size_t size = 0; + UnitInfo u; r = sd_bus_call_method( bus, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "ListUnits", - &error, - &reply, - ""); + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "ListUnits", + &error, &reply, + NULL); if (r < 0) { - log_error("Failed to parse reply: %s", bus_error_message(&error, -r)); - goto fail; + log_error("Failed to list units: %s", bus_error_message(&error, -r)); + goto fail; } r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssssouso)"); - if (r < 0) - goto fail; + if (r < 0) { + bus_log_parse_error(r); + goto fail; + } while ((r = bus_parse_unit_info(reply, &u)) > 0) { struct unit_times *t; - if (r < 0) - 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; + if (!GREEDY_REALLOC(unit_times, size, c+1)) { + r = log_oom(); + goto fail; } + t = unit_times+c; t->name = NULL; @@ -317,6 +269,10 @@ static int acquire_time_data(sd_bus *bus, struct unit_times **out) { } c++; } + if (r < 0) { + bus_log_parse_error(r); + goto fail; + } *out = unit_times; return c; @@ -389,7 +345,7 @@ static int acquire_boot_times(sd_bus *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) @@ -656,7 +612,7 @@ static int analyze_plot(sd_bus *bus) { svg("\n\n"); - svg(""); + svg("\n"); free_unit_times(times, (unsigned) n); @@ -682,17 +638,15 @@ static int list_dependencies_print(const char *name, unsigned int level, unsigne 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(sd_bus *bus, const char *name, char ***deps) { - _cleanup_free_ char *path; - - int r = 0; - char **ret = NULL; + _cleanup_free_ char *path = NULL; assert(bus); assert(name); @@ -700,15 +654,9 @@ static int list_dependencies_get_dependencies(sd_bus *bus, const char *name, cha path = unit_dbus_path_from_name(name); if (path == NULL) - return -EINVAL; - - r = bus_get_unit_property_strv(bus, path, "After", &ret); + return -ENOMEM; - 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; @@ -738,7 +686,7 @@ static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int lev 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); @@ -825,7 +773,7 @@ static int list_dependencies(sd_bus *bus, const char *name) { path = unit_dbus_path_from_name(name); if (path == NULL) - return -EINVAL; + return -ENOMEM; r = sd_bus_get_property( bus, @@ -837,15 +785,13 @@ static int list_dependencies(sd_bus *bus, const char *name) { &reply, "s"); if (r < 0) { - log_error("Failed to parse reply: %s", bus_error_message(&error, -r)); + log_error("Failed to get ID: %s", bus_error_message(&error, -r)); return r; } r = sd_bus_message_read(reply, "s", &id); - if (r < 0) { - log_error("Failed to parse reply."); - return r; - } + if (r < 0) + return bus_log_parse_error(r); times = hashmap_get(unit_times_hashmap, id); @@ -868,9 +814,9 @@ static int list_dependencies(sd_bus *bus, const char *name) { 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) @@ -940,7 +886,7 @@ static int analyze_time(sd_bus *bus) { return 0; } -static int graph_one_property(sd_bus *bus, const struct unit_info *u, const char* prop, const char *color, char* patterns[]) { +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; @@ -950,9 +896,8 @@ static int graph_one_property(sd_bus *bus, const struct unit_info *u, const char assert(color); r = bus_get_unit_property_strv(bus, u->unit_path, prop, &units); - if (r < 0) { - return -r; - } + if (r < 0) + return r; STRV_FOREACH(unit, units) { char **p; @@ -1002,7 +947,7 @@ static int graph_one_property(sd_bus *bus, const struct unit_info *u, const char return 0; } -static int graph_one(sd_bus *bus, const struct unit_info *u, char *patterns[]) { +static int graph_one(sd_bus *bus, const UnitInfo *u, char *patterns[]) { int r; assert(bus); @@ -1042,7 +987,7 @@ 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; - struct unit_info u; + UnitInfo u; r = sd_bus_call_method( bus, @@ -1054,21 +999,24 @@ static int dot(sd_bus *bus, char* patterns[]) { &reply, ""); if (r < 0) { - log_error("Failed to parse reply: %s", bus_error_message(&error, -r)); - return r; + log_error("Failed to list units: %s", bus_error_message(&error, -r)); + return r; } r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssssouso)"); if (r < 0) - return r; + return bus_log_parse_error(r); printf("digraph systemd {\n"); 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"); @@ -1084,6 +1032,7 @@ static int dot(sd_bus *bus, char* patterns[]) { return 0; } + 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; @@ -1107,15 +1056,13 @@ static int dump(sd_bus *bus, char **args) { &reply, ""); if (r < 0) { - log_error("Failed to parse reply: %s", bus_error_message(&error, -r)); - return r; + log_error("Failed issue method call: %s", bus_error_message(&error, -r)); + return r; } r = sd_bus_message_read(reply, "s", &text); - if (r < 0) { - log_error("Failed to parse reply"); - return r; - } + if (r < 0) + return bus_log_parse_error(r); fputs(text, stdout); return 0; @@ -1124,7 +1071,6 @@ static int dump(sd_bus *bus, char **args) { static int set_log_level(sd_bus *bus, char **args) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; - const char* value; assert(bus); assert(args); @@ -1134,8 +1080,6 @@ static int set_log_level(sd_bus *bus, char **args) { return -E2BIG; } - value = args[0]; - r = sd_bus_set_property( bus, "org.freedesktop.systemd1", @@ -1144,7 +1088,7 @@ static int set_log_level(sd_bus *bus, char **args) { "LogLevel", &error, "s", - value); + args[0]); if (r < 0) { log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); return -EIO; @@ -1153,44 +1097,46 @@ static int set_log_level(sd_bus *bus, char **args) { return 0; } -static void analyze_help(void) { +static int 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" + "Process systemd profiling information.\n\n" + " -h --help Show this help\n" + " --version Show package version\n" + " --no-pager Do not pipe output into a pager\n" + " --system Connect to system manager\n" + " --user Connect to user manager\n" + " -H --host=[USER@]HOST Operate on remote host\n" + " -M --machine=CONTAINER Operate on local container\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" + " 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\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", + " 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); /* When updating this list, including descriptions, apply * changes to shell-completion/bash/systemd and * shell-completion/systemd-zsh-completion.zsh too. */ + + return 0; } static int parse_argv(int argc, char *argv[]) { - int r; - enum { ARG_VERSION = 0x100, ARG_ORDER, @@ -1214,29 +1160,34 @@ 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 } + { "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(); - return 0; + return help(); 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: @@ -1269,8 +1220,15 @@ 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_CONTAINER; + arg_host = optarg; + break; case '?': return -EINVAL; @@ -1279,6 +1237,8 @@ static int parse_argv(int argc, char *argv[]) { assert_not_reached("Unhandled option"); } } + + return 1; } int main(int argc, char *argv[]) { @@ -1294,13 +1254,9 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; - if (arg_scope == UNIT_FILE_SYSTEM) - r = sd_bus_open_system(&bus); - else - r = sd_bus_open_user(&bus); - + r = bus_open_transport(arg_transport, arg_host, arg_user, &bus); if (r < 0) { - log_error("Failed to connect to bus: %s", strerror(-r)); + log_error("Failed to create bus connection: %s", strerror(-r)); goto finish; }