chiark / gitweb /
clients: add missing command line arguments
[elogind.git] / src / analyze / analyze.c
index 22bf076..b80b91c 100644 (file)
@@ -89,19 +89,6 @@ struct boot_times {
         usec_t unitsload_finish_time;
 };
 
         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;
 struct unit_times {
         char *name;
         usec_t activating;
@@ -123,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;
 
         _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",
         r = sd_bus_get_property_trivial(
                         bus,
                         "org.freedesktop.systemd1",
@@ -140,6 +133,31 @@ static int bus_get_uint64_property(sd_bus *bus, const char *path, const char *in
         return 0;
 }
 
         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_time(const void *a, const void *b) {
         return compare(((struct unit_times *)b)->time,
                        ((struct unit_times *)a)->time);
@@ -174,109 +192,41 @@ static void free_unit_times(struct unit_times *t, unsigned n) {
         free(t);
 }
 
         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;
 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_times *unit_times = NULL;
-        struct unit_info u;
+        size_t size = 0;
+        UnitInfo u;
 
         r = sd_bus_call_method(
                         bus,
 
         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) {
         if (r < 0) {
-                log_error("Failed to parse reply: %s", bus_error_message(&error, -r));
+                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)");
                 goto fail;
         }
 
         r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssssouso)");
-        if (r < 0)
+        if (r < 0) {
+                bus_log_parse_error(r);
                 goto fail;
                 goto fail;
+        }
 
         while ((r = bus_parse_unit_info(reply, &u)) > 0) {
                 struct unit_times *t;
 
 
         while ((r = bus_parse_unit_info(reply, &u)) > 0) {
                 struct unit_times *t;
 
-                if (r < 0)
+                if (!GREEDY_REALLOC(unit_times, size, c+1)) {
+                        r = log_oom();
                         goto fail;
                         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;
 
                 t = unit_times+c;
                 t->name = NULL;
 
@@ -319,6 +269,10 @@ static int acquire_time_data(sd_bus *bus, struct unit_times **out) {
                 }
                 c++;
         }
                 }
                 c++;
         }
+        if (r < 0) {
+                bus_log_parse_error(r);
+                goto fail;
+        }
 
         *out = unit_times;
         return c;
 
         *out = unit_times;
         return c;
@@ -391,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.");
 
         if (times.finish_time <= 0) {
                 log_error("Bootup is not yet finished. Please try again later.");
-                return -EAGAIN;
+                return -EINPROGRESS;
         }
 
         if (times.initrd_time)
         }
 
         if (times.initrd_time)
@@ -658,7 +612,7 @@ static int analyze_plot(sd_bus *bus) {
 
         svg("</g>\n\n");
 
 
         svg("</g>\n\n");
 
-        svg("</svg>");
+        svg("</svg>\n");
 
         free_unit_times(times, (unsigned) n);
 
 
         free_unit_times(times, (unsigned) n);
 
@@ -684,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);
                         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) {
         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);
 
         assert(bus);
         assert(name);
@@ -702,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)
 
         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;
 }
 
 static Hashmap *unit_times_hashmap;
@@ -740,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;
 
         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);
                 return log_oom();
 
         r = list_dependencies_get_dependencies(bus, name, &deps);
@@ -827,7 +773,7 @@ static int list_dependencies(sd_bus *bus, const char *name) {
 
         path = unit_dbus_path_from_name(name);
         if (path == NULL)
 
         path = unit_dbus_path_from_name(name);
         if (path == NULL)
-                return -EINVAL;
+                return -ENOMEM;
 
         r = sd_bus_get_property(
                         bus,
 
         r = sd_bus_get_property(
                         bus,
@@ -839,15 +785,13 @@ static int list_dependencies(sd_bus *bus, const char *name) {
                         &reply,
                         "s");
         if (r < 0) {
                         &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);
                 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);
 
 
         times = hashmap_get(unit_times_hashmap, id);
 
@@ -870,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;
 
 static int analyze_critical_chain(sd_bus *bus, char *names[]) {
         struct unit_times *times;
-        int n, r;
         unsigned int i;
         Hashmap *h;
         unsigned int i;
         Hashmap *h;
+        int n, r;
 
         n = acquire_time_data(bus, &times);
         if (n <= 0)
 
         n = acquire_time_data(bus, &times);
         if (n <= 0)
@@ -942,7 +886,7 @@ static int analyze_time(sd_bus *bus) {
         return 0;
 }
 
         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;
         _cleanup_strv_free_ char **units = NULL;
         char **unit;
         int r;
@@ -953,7 +897,7 @@ static int graph_one_property(sd_bus *bus, const struct unit_info *u, const char
 
         r = bus_get_unit_property_strv(bus, u->unit_path, prop, &units);
         if (r < 0)
 
         r = bus_get_unit_property_strv(bus, u->unit_path, prop, &units);
         if (r < 0)
-                return -r;
+                return r;
 
         STRV_FOREACH(unit, units) {
                 char **p;
 
         STRV_FOREACH(unit, units) {
                 char **p;
@@ -1003,7 +947,7 @@ static int graph_one_property(sd_bus *bus, const struct unit_info *u, const char
         return 0;
 }
 
         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);
         int r;
 
         assert(bus);
@@ -1043,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;
         _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,
 
         r = sd_bus_call_method(
                         bus,
@@ -1055,21 +999,24 @@ static int dot(sd_bus *bus, char* patterns[]) {
                        &reply,
                        "");
         if (r < 0) {
                        &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)
         }
 
         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) {
 
         printf("digraph systemd {\n");
 
         while ((r = bus_parse_unit_info(reply, &u)) > 0) {
+
                 r = graph_one(bus, &u, patterns);
                 if (r < 0)
                         return r;
         }
                 r = graph_one(bus, &u, patterns);
                 if (r < 0)
                         return r;
         }
+        if (r < 0)
+                return bus_log_parse_error(r);
 
         printf("}\n");
 
 
         printf("}\n");
 
@@ -1109,15 +1056,13 @@ static int dump(sd_bus *bus, char **args) {
                        &reply,
                        "");
         if (r < 0) {
                        &reply,
                        "");
         if (r < 0) {
-                log_error("Failed to parse reply: %s", bus_error_message(&error, -r));
+                log_error("Failed issue method call: %s", bus_error_message(&error, -r));
                 return r;
         }
 
         r = sd_bus_message_read(reply, "s", &text);
                 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;
 
         fputs(text, stdout);
         return 0;
@@ -1160,6 +1105,7 @@ static int help(void) {
                "Process systemd profiling information.\n\n"
                "  -h --help               Show this help\n"
                "     --version            Show package version\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"
                "     --system             Connect to system manager\n"
                "     --user               Connect to user manager\n"
                "  -H --host=[USER@]HOST   Operate on remote host\n"
@@ -1172,8 +1118,7 @@ static int help(void) {
                "     --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"
                "     --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"
+               "                          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"
                "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"
@@ -1215,6 +1160,8 @@ 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         },
                 { "to-pattern",   required_argument, NULL, ARG_DOT_TO_PATTERN   },
                 { "fuzz",         required_argument, NULL, ARG_FUZZ             },
                 { "no-pager",     no_argument,       NULL, ARG_NO_PAGER         },
+                { "host",         required_argument, NULL, 'H'                  },
+                { "machine",      required_argument, NULL, 'M'                  },
                 {}
         };
 
                 {}
         };