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=144e821a321490b3ac15bb09d197cff0faf7951b;hb=8fe12d88a8b4d5beb64e5d4efd205043a01b0c13;hpb=a936124f7ac441b7b32ea9f04fae02a573dbd954;ds=sidebyside diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 144e821a3..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,25 +89,12 @@ 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 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; }; @@ -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,14 +133,39 @@ 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); } static int compare_unit_start(const void *a, const void *b) { - return compare(((struct unit_times *)a)->ixt, - ((struct unit_times *)b)->ixt); + return compare(((struct unit_times *)a)->activating, + ((struct unit_times *)b)->activating); } static int get_os_name(char **_n) { @@ -172,74 +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 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; @@ -248,31 +235,31 @@ static int acquire_time_data(sd_bus *bus, struct unit_times **out) { 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); @@ -282,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; @@ -354,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) @@ -474,28 +465,32 @@ static int analyze_plot(sd_bus *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++; } @@ -573,7 +568,7 @@ static int analyze_plot(sd_bus *bus) { svg_bar("active", boot->userspace_time, boot->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++) { @@ -583,40 +578,41 @@ static int analyze_plot(sd_bus *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++; } /* Legend */ 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("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); @@ -636,67 +632,31 @@ static int list_dependencies_print(const char *name, unsigned int level, unsigne 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(sd_bus *bus, const char *name, char ***deps) { - _cleanup_free_ char *path; - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - - int r = 0; - const char *s; - char **ret = NULL; + _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 = sd_bus_get_property(bus, - "org.freedesktop.systemd1", - path, - "org.freedesktop.systemd1.Unit", - "After", - &error, - &reply, - "as"); - if (r < 0) { - log_error("Failed to parse reply: %s", bus_error_message(&error, -r)); - goto finish; - } - - r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "s"); - if (r < 0) - goto finish; + if (path == NULL) + return -ENOMEM; - while ((r = sd_bus_message_read(reply, "s", &s)) > 0) { - r = strv_extend(&ret, s); - if (r < 0) { - log_oom(); - goto finish; - } - } -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; @@ -708,10 +668,10 @@ 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; } @@ -726,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); @@ -742,11 +702,11 @@ static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int lev 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; } } @@ -756,9 +716,9 @@ static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int lev 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++; } } @@ -769,9 +729,9 @@ static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int lev 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--; @@ -813,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, @@ -825,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); @@ -845,8 +803,8 @@ static int list_dependencies(sd_bus *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); } @@ -856,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) @@ -928,11 +886,8 @@ 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[]) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; +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; - const char *s; char **unit; int r; @@ -940,30 +895,9 @@ static int graph_one_property(sd_bus *bus, const struct unit_info *u, const char assert(prop); assert(color); - r = sd_bus_get_property(bus, - "org.freedesktop.systemd1", - u->unit_path, - "org.freedesktop.systemd1.Unit", - prop, - &error, - &reply, - "as"); - if (r < 0) { - log_error("Failed to parse reply: %s", bus_error_message(&error, -r)); - return -r; - } - - r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "s"); + r = bus_get_unit_property_strv(bus, u->unit_path, prop, &units); if (r < 0) - return -r; - - while ((r = sd_bus_message_read(reply, "s", &s)) > 0) { - r = strv_extend(&units, s); - if (r < 0) { - log_oom(); - return -r; - } - } + return r; STRV_FOREACH(unit, units) { char **p; @@ -1013,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); @@ -1053,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, @@ -1065,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"); @@ -1095,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; @@ -1118,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; @@ -1135,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); @@ -1145,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", @@ -1155,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; @@ -1164,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, @@ -1225,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: @@ -1280,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; @@ -1290,6 +1237,8 @@ static int parse_argv(int argc, char *argv[]) { assert_not_reached("Unhandled option"); } } + + return 1; } int main(int argc, char *argv[]) { @@ -1305,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; }