bootchart: display each CPU utilization/wait

[elogind.git] / src / bootchart / bootchart.c

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 01a5bf18ef7342187535e418db1a485c893dfda7..64a384bacfa6a3ccce7a173fa1e4d558776d1e0a 100644 (file)
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -48,7 +48,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>

-#include <systemd/sd-journal.h>
+#include "systemd/sd-journal.h"

 
 #include "util.h"
 #include "fileio.h"
 
 #include "util.h"
 #include "fileio.h"


@@ -76,7 +76,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_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 ROOTLIBDIR "/systemd/systemd"

 #define DEFAULT_OUTPUT "/run/log"
 
 /* graph defaults */
 #define DEFAULT_OUTPUT "/run/log"
 
 /* graph defaults */


@@ -87,6 +87,7 @@ bool arg_filter = true;
 bool arg_show_cmdline = false;
 bool arg_show_cgroup = false;
 bool arg_pss = false;
 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;
 int samples;
 int arg_samples_len = DEFAULT_SAMPLES_LEN; /* we record len+1 (1 start sample) */
 double arg_hz = DEFAULT_HZ;


@@ -122,19 +123,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", "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 }
         };
                 { NULL, NULL, NULL, 0, NULL }
         };

-        _cleanup_fclose_ FILE *f;
-        int r;
-
-        f = fopen(BOOTCHART_CONF, "re");
-        if (!f)
-                return;

 
 

-        r = config_parse(NULL, BOOTCHART_CONF, f,
-                         NULL, config_item_table_lookup, (void*) items, true, false, NULL);
-        if (r < 0)
-                log_warning("Failed to parse configuration file: %s", strerror(-r));
+        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);
 
         if (init != NULL)
                 strscpy(arg_init_path, sizeof(arg_init_path), init);


@@ -158,6 +153,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"
                 "  -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,
                 "  -h, --help            Display this message\n\n"
                 "See bootchart.conf for more information.\n",
                 program_invocation_short_name,


@@ -169,37 +165,45 @@ static void help(void) {
                 DEFAULT_INIT);
 }
 
                 DEFAULT_INIT);
 }
 

-static int parse_args(int argc, char *argv[]) {
-        static 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'},
-                {NULL, 0, NULL, 0}
+static int parse_argv(int argc, char *argv[]) {
+
+        enum {
+                ARG_PERCPU = 0x100,

         };
         };

-        int c;

 
 

-        while ((c = getopt_long(argc, argv, "erpf:n:o:i:FCchx:y:", options, NULL)) >= 0) {
-                int r;
+        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'       },
+                {"per-cpu",       no_argument,        NULL,  ARG_PERCPU},
+                {}
+        };
+        int c, r;

 
 

+        if (getpid() == 1)
+                opterr = 0;
+
+        while ((c = getopt_long(argc, argv, "erpf:n:o:i:FCchx:y:", options, NULL)) >= 0)

                 switch (c) {
                 switch (c) {

+

                 case 'r':
                         arg_relative = true;
                         break;
                 case 'f':
                         r = safe_atod(optarg, &arg_hz);
                         if (r < 0)
                 case 'r':
                         arg_relative = true;
                         break;
                 case 'f':
                         r = safe_atod(optarg, &arg_hz);
                         if (r < 0)

-                                log_warning("failed to parse --freq/-f argument '%s': %s",
-                                            optarg, strerror(-r));
+                                log_warning_errno(r, "failed to parse --freq/-f argument '%s': %m",
+                                                  optarg);

                         break;
                 case 'F':
                         arg_filter = false;
                         break;
                 case 'F':
                         arg_filter = false;


@@ -213,8 +217,8 @@ static int parse_args(int argc, char *argv[]) {
                 case 'n':
                         r = safe_atoi(optarg, &arg_samples_len);
                         if (r < 0)
                 case 'n':
                         r = safe_atoi(optarg, &arg_samples_len);
                         if (r < 0)

-                                log_warning("failed to parse --samples/-n argument '%s': %s",
-                                            optarg, strerror(-r));
+                                log_warning_errno(r, "failed to parse --samples/-n argument '%s': %m",
+                                                  optarg);

                         break;
                 case 'o':
                         path_kill_slashes(optarg);
                         break;
                 case 'o':
                         path_kill_slashes(optarg);


@@ -230,32 +234,39 @@ static int parse_args(int argc, char *argv[]) {
                 case 'x':
                         r = safe_atod(optarg, &arg_scale_x);
                         if (r < 0)
                 case 'x':
                         r = safe_atod(optarg, &arg_scale_x);
                         if (r < 0)

-                                log_warning("failed to parse --scale-x/-x argument '%s': %s",
-                                            optarg, strerror(-r));
+                                log_warning_errno(r, "failed to parse --scale-x/-x argument '%s': %m",
+                                                  optarg);

                         break;
                 case 'y':
                         r = safe_atod(optarg, &arg_scale_y);
                         if (r < 0)
                         break;
                 case 'y':
                         r = safe_atod(optarg, &arg_scale_y);
                         if (r < 0)

-                                log_warning("failed to parse --scale-y/-y argument '%s': %s",
-                                            optarg, strerror(-r));
+                                log_warning_errno(r, "failed to parse --scale-y/-y argument '%s': %m",
+                                                  optarg);

                         break;
                 case 'e':
                         arg_entropy = true;
                         break;
                         break;
                 case 'e':
                         arg_entropy = true;
                         break;

+                case ARG_PERCPU:
+                        arg_percpu = true;
+                        break;

                 case 'h':
                         help();
                 case 'h':
                         help();

-                        exit (EXIT_SUCCESS);
+                        return 0;
+                case '?':
+                        if (getpid() != 1)
+                                return -EINVAL;
+                        else
+                                return 0;

                 default:
                 default:

-                        break;
+                        assert_not_reached("Unhandled option code.");

                 }
                 }

-        }

 
 

-        if (arg_hz <= 0.0) {
-                fprintf(stderr, "Error: Frequency needs to be > 0\n");
+        if (arg_hz <= 0) {
+                log_error("Frequency needs to be > 0");

                 return -EINVAL;
         }
 
                 return -EINVAL;
         }
 

-        return 0;
+        return 1;

 }
 
 static void do_journal_append(char *file) {
 }
 
 static void do_journal_append(char *file) {


@@ -285,12 +296,12 @@ static void do_journal_append(char *file) {
 
         f = open(file, O_RDONLY|O_CLOEXEC);
         if (f < 0) {
 
         f = open(file, O_RDONLY|O_CLOEXEC);
         if (f < 0) {

-                log_error("Failed to read bootchart data: %m");
+                log_error_errno(errno, "Failed to read bootchart data: %m");

                 return;
         }
         n = loop_read(f, p + 10, BOOTCHART_MAX, false);
         if (n < 0) {
                 return;
         }
         n = loop_read(f, p + 10, BOOTCHART_MAX, false);
         if (n < 0) {

-                log_error("Failed to read bootchart data: %s", strerror(-n));
+                log_error_errno(n, "Failed to read bootchart data: %m");

                 close(f);
                 return;
         }
                 close(f);
                 return;
         }


@@ -302,7 +313,7 @@ static void do_journal_append(char *file) {
 
         r = sd_journal_sendv(iovec, j);
         if (r < 0)
 
         r = sd_journal_sendv(iovec, j);
         if (r < 0)

-                log_error("Failed to send bootchart: %s", strerror(-r));
+                log_error_errno(r, "Failed to send bootchart: %m");

 }
 
 int main(int argc, char *argv[]) {
 }
 
 int main(int argc, char *argv[]) {


@@ -316,17 +327,18 @@ int main(int argc, char *argv[]) {
         time_t t = 0;
         int r;
         struct rlimit rlim;
         time_t t = 0;
         int r;
         struct rlimit rlim;

+        bool has_procfs = false;

 
         parse_conf();
 
 
         parse_conf();
 

-        r = parse_args(argc, argv);
-        if (r < 0)
-                return EXIT_FAILURE;
+        r = parse_argv(argc, argv);
+        if (r <= 0)
+                return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE;

 
         /*
          * If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then
          * fork:
 
         /*
          * 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) {
          * - child logs data
          */
         if (getpid() == 1) {


@@ -355,6 +367,16 @@ int main(int argc, char *argv[]) {
 
         log_uptime();
 
 
         log_uptime();
 

+        if (graph_start < 0.0) {
+                fprintf(stderr,
+                        "Failed to setup graph start time.\n\nThe system uptime "
+                        "probably includes time that the system was suspended. "
+                        "Use --rel to bypass this issue.\n");
+                exit (EXIT_FAILURE);
+        }
+
+        has_procfs = access("/proc/vmstat", F_OK) == 0;
+

         LIST_HEAD_INIT(head);
 
         /* main program loop */
         LIST_HEAD_INIT(head);
 
         /* main program loop */


@@ -369,8 +391,8 @@ int main(int argc, char *argv[]) {
 
                 sampledata = new0(struct list_sample_data, 1);
                 if (sampledata == NULL) {
 
                 sampledata = new0(struct list_sample_data, 1);
                 if (sampledata == NULL) {

-                        log_error("Failed to allocate memory for a node: %m");
-                        return -1;
+                        log_oom();
+                        return EXIT_FAILURE;

                 }
 
                 sampledata->sampletime = gettime_ns();
                 }
 
                 sampledata->sampletime = gettime_ns();


@@ -378,7 +400,9 @@ int main(int argc, char *argv[]) {
 
                 if (!of && (access(arg_output_path, R_OK|W_OK|X_OK) == 0)) {
                         t = time(NULL);
 
                 if (!of && (access(arg_output_path, R_OK|W_OK|X_OK) == 0)) {
                         t = time(NULL);

-                        strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+                        r = strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+                        assert_se(r > 0);
+

                         snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
                         of = fopen(output_file, "we");
                 }
                         snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
                         of = fopen(output_file, "we");
                 }


@@ -391,11 +415,11 @@ int main(int argc, char *argv[]) {
                                 parse_env_file("/usr/lib/os-release", NEWLINE, "PRETTY_NAME", &build, NULL);
                 }
 
                                 parse_env_file("/usr/lib/os-release", NEWLINE, "PRETTY_NAME", &build, NULL);
                 }
 

-                /* wait for /proc to become available, discarding samples */
-                if (graph_start <= 0.0)
-                        log_uptime();
-                else
+                if (has_procfs)

                         log_sample(samples, &sampledata);
                         log_sample(samples, &sampledata);

+                else
+                        /* wait for /proc to become available, discarding samples */
+                        has_procfs = access("/proc/vmstat", F_OK) == 0;

 
                 sample_stop = gettime_ns();
 
 
                 sample_stop = gettime_ns();
 


@@ -421,7 +445,7 @@ int main(int argc, char *argv[]) {
                                         /* caught signal, probably HUP! */
                                         break;
                                 }
                                         /* caught signal, probably HUP! */
                                         break;
                                 }

-                                log_error("nanosleep() failed: %m");
+                                log_error_errno(errno, "nanosleep() failed: %m");

                                 exit(EXIT_FAILURE);
                         }
                 } else {
                                 exit(EXIT_FAILURE);
                         }
                 } else {


@@ -446,7 +470,9 @@ int main(int argc, char *argv[]) {
 
         if (!of) {
                 t = time(NULL);
 
         if (!of) {
                 t = time(NULL);

-                strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+                r = strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+                assert_se(r > 0);
+

                 snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
                 of = fopen(output_file, "we");
         }
                 snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
                 of = fopen(output_file, "we");
         }


@@ -456,7 +482,7 @@ int main(int argc, char *argv[]) {
                 exit (EXIT_FAILURE);
         }
 
                 exit (EXIT_FAILURE);
         }
 

-        svg_do(build);
+        svg_do(strna(build));

 
         fprintf(stderr, "systemd-bootchart wrote %s\n", output_file);
 
 
         fprintf(stderr, "systemd-bootchart wrote %s\n", output_file);