X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbootchart%2Fbootchart.c;h=607ec42690ad23bec9f746bbb8e8d0f9acd12601;hb=113b3fc1a8061f4a24dd0db74e9a3cd0083b2251;hp=5bb4247c8cbef713d27aaf7d553b87e9e83eb342;hpb=56f64d95763a799ba4475daf44d8e9f72a1bd474;p=elogind.git

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 5bb4247c8..607ec4269 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -33,10 +33,7 @@
 
  ***/
 
-#include <sys/time.h>
-#include <sys/types.h>
 #include <sys/resource.h>
-#include <sys/stat.h>
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -76,7 +73,7 @@ int sysfd=-1;
 #define DEFAULT_HZ 25.0
 #define DEFAULT_SCALE_X 100.0 /* 100px = 1sec */
 #define DEFAULT_SCALE_Y 20.0  /* 16px = 1 process bar */
-#define DEFAULT_INIT "/sbin/init"
+#define DEFAULT_INIT ROOTLIBEXECDIR "/systemd"
 #define DEFAULT_OUTPUT "/run/log"
 
 /* graph defaults */
@@ -87,6 +84,7 @@ bool arg_filter = true;
 bool arg_show_cmdline = false;
 bool arg_show_cgroup = false;
 bool arg_pss = false;
+bool arg_percpu = false;
 int samples;
 int arg_samples_len = DEFAULT_SAMPLES_LEN; /* we record len+1 (1 start sample) */
 double arg_hz = DEFAULT_HZ;
@@ -122,13 +120,13 @@ static void parse_conf(void) {
                 { "Bootchart", "ScaleX",           config_parse_double, 0, &arg_scale_x     },
                 { "Bootchart", "ScaleY",           config_parse_double, 0, &arg_scale_y     },
                 { "Bootchart", "ControlGroup",     config_parse_bool,   0, &arg_show_cgroup },
+                { "Bootchart", "PerCPU",           config_parse_bool,   0, &arg_percpu      },
                 { NULL, NULL, NULL, 0, NULL }
         };
 
-        config_parse(NULL, BOOTCHART_CONF, NULL,
-                     NULL,
-                     config_item_table_lookup, items,
-                     true, false, true, NULL);
+        config_parse_many(BOOTCHART_CONF,
+                          CONF_DIRS_NULSTR("systemd/bootchart.conf"),
+                          NULL, config_item_table_lookup, items, true, NULL);
 
         if (init != NULL)
                 strscpy(arg_init_path, sizeof(arg_init_path), init);
@@ -152,6 +150,7 @@ static void help(void) {
                 "  -F, --no-filter       Disable filtering of unimportant or ephemeral processes\n"
                 "  -C, --cmdline         Display full command lines with arguments\n"
                 "  -c, --control-group   Display process control group\n"
+                "      --per-cpu         Draw each CPU utilization and wait bar also\n"
                 "  -h, --help            Display this message\n\n"
                 "See bootchart.conf for more information.\n",
                 program_invocation_short_name,
@@ -164,20 +163,26 @@ static void help(void) {
 }
 
 static int parse_argv(int argc, char *argv[]) {
+
+        enum {
+                ARG_PERCPU = 0x100,
+        };
+
         static const struct option options[] = {
-                {"rel",           no_argument,        NULL,  'r'},
-                {"freq",          required_argument,  NULL,  'f'},
-                {"samples",       required_argument,  NULL,  'n'},
-                {"pss",           no_argument,        NULL,  'p'},
-                {"output",        required_argument,  NULL,  'o'},
-                {"init",          required_argument,  NULL,  'i'},
-                {"no-filter",     no_argument,        NULL,  'F'},
-                {"cmdline",       no_argument,        NULL,  'C'},
-                {"control-group", no_argument,        NULL,  'c'},
-                {"help",          no_argument,        NULL,  'h'},
-                {"scale-x",       required_argument,  NULL,  'x'},
-                {"scale-y",       required_argument,  NULL,  'y'},
-                {"entropy",       no_argument,        NULL,  'e'},
+                {"rel",           no_argument,        NULL,  'r'       },
+                {"freq",          required_argument,  NULL,  'f'       },
+                {"samples",       required_argument,  NULL,  'n'       },
+                {"pss",           no_argument,        NULL,  'p'       },
+                {"output",        required_argument,  NULL,  'o'       },
+                {"init",          required_argument,  NULL,  'i'       },
+                {"no-filter",     no_argument,        NULL,  'F'       },
+                {"cmdline",       no_argument,        NULL,  'C'       },
+                {"control-group", no_argument,        NULL,  'c'       },
+                {"help",          no_argument,        NULL,  'h'       },
+                {"scale-x",       required_argument,  NULL,  'x'       },
+                {"scale-y",       required_argument,  NULL,  'y'       },
+                {"entropy",       no_argument,        NULL,  'e'       },
+                {"per-cpu",       no_argument,        NULL,  ARG_PERCPU},
                 {}
         };
         int c, r;
@@ -238,6 +243,9 @@ static int parse_argv(int argc, char *argv[]) {
                 case 'e':
                         arg_entropy = true;
                         break;
+                case ARG_PERCPU:
+                        arg_percpu = true;
+                        break;
                 case 'h':
                         help();
                         return 0;
@@ -327,7 +335,7 @@ int main(int argc, char *argv[]) {
         /*
          * If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then
          * fork:
-         * - parent execs executable specified via init_path[] (/sbin/init by default) as pid=1
+         * - parent execs executable specified via init_path[] (/usr/lib/systemd/systemd by default) as pid=1
          * - child logs data
          */
         if (getpid() == 1) {