X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fanalyze%2Fanalyze.c;h=3d2d08f6676222742c2ac5f3d99de79291adb1bd;hb=08af0da26935e827b58809ff1946e2f7d496e666;hp=b80b91c5b7483553d31c90043340c5fa0428404f;hpb=8fe12d88a8b4d5beb64e5d4efd205043a01b0c13;p=elogind.git

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index b80b91c5b..3d2d08f66 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -83,6 +83,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;
@@ -321,6 +323,16 @@ static int acquire_boot_times(sd_bus *bus, struct boot_times **bt) {
                                     "org.freedesktop.systemd1.Manager",
                                     "FinishTimestampMonotonic",
                                     &times.finish_time) < 0 ||
+            bus_get_uint64_property(bus,
+                                    "/org/freedesktop/systemd1",
+                                    "org.freedesktop.systemd1.Manager",
+                                    "SecurityStartTimestampMonotonic",
+                                    &times.security_start_time) < 0 ||
+            bus_get_uint64_property(bus,
+                                    "/org/freedesktop/systemd1",
+                                    "org.freedesktop.systemd1.Manager",
+                                    "SecurityFinishTimestampMonotonic",
+                                    &times.security_finish_time) < 0 ||
             bus_get_uint64_property(bus,
                                     "/org/freedesktop/systemd1",
                                     "org.freedesktop.systemd1.Manager",
@@ -523,6 +535,7 @@ static int analyze_plot(sd_bus *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"
@@ -543,7 +556,7 @@ static int analyze_plot(sd_bus *bus) {
             name.nodename, name.release, name.version, name.machine);
 
         svg("<g transform=\"translate(%.3f,100)\">\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);
@@ -566,6 +579,7 @@ static int analyze_plot(sd_bus *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(true, boot->userspace_time, y, "systemd");
@@ -592,7 +606,10 @@ static int analyze_plot(sd_bus *bus) {
                 y++;
         }
 
+        svg("</g>\n");
+
         /* Legend */
+        svg("<g transform=\"translate(20,100)\">\n");
         y++;
         svg_bar("activating", 0, 300000, y);
         svg_text(true, 400000, y, "Activating");
@@ -603,6 +620,9 @@ static int analyze_plot(sd_bus *bus) {
         svg_bar("deactivating", 0, 300000, y);
         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(true, 400000, y, "Generators");
         y++;
@@ -723,7 +743,7 @@ static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int lev
                 }
         }
 
-        if(!to_print)
+        if (!to_print)
                 return r;
 
         STRV_FOREACH(c, deps) {