X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbootchart%2Fbootchart.c;h=64a384bacfa6a3ccce7a173fa1e4d558776d1e0a;hp=2226ebad6a667ab6eeccc725bb82772b00168725;hb=749806b389f53f7dd43a2cae1589e63dddf51990;hpb=9e6d4c613d14ee98ff1d7c88b2084697a40815fc diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 2226ebad6..64a384bac 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -3,7 +3,7 @@ /*** This file is part of systemd. - Copyright (C) 2009-2013 Intel Coproration + Copyright (C) 2009-2013 Intel Corporation Authors: Auke Kok @@ -48,7 +48,7 @@ #include #include #include -#include +#include "systemd/sd-journal.h" #include "util.h" #include "fileio.h" @@ -59,14 +59,11 @@ #include "store.h" #include "svg.h" #include "bootchart.h" +#include "list.h" double graph_start; double log_start; -double sampletime[MAXSAMPLES]; struct ps_struct *ps_first; -struct block_stat_struct blockstat[MAXSAMPLES]; -int entropy_avail[MAXSAMPLES]; -struct cpu_stat_struct cpustat[MAXCPUS]; int pscount; int cpus; double interval; @@ -75,21 +72,32 @@ int overrun = 0; static int exiting = 0; int sysfd=-1; +#define DEFAULT_SAMPLES_LEN 500 +#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 ROOTLIBDIR "/systemd/systemd" +#define DEFAULT_OUTPUT "/run/log" + /* graph defaults */ bool arg_entropy = false; bool initcall = true; bool arg_relative = false; 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 = 500; /* we record len+1 (1 start sample) */ -double arg_hz = 25.0; /* 20 seconds log time */ -double arg_scale_x = 100.0; /* 100px = 1sec */ -double arg_scale_y = 20.0; /* 16px = 1 process bar */ +int arg_samples_len = DEFAULT_SAMPLES_LEN; /* we record len+1 (1 start sample) */ +double arg_hz = DEFAULT_HZ; +double arg_scale_x = DEFAULT_SCALE_X; +double arg_scale_y = DEFAULT_SCALE_Y; +static struct list_sample_data *sampledata; +struct list_sample_data *head; -char arg_init_path[PATH_MAX] = "/sbin/init"; -char arg_output_path[PATH_MAX] = "/run/log"; +char arg_init_path[PATH_MAX] = DEFAULT_INIT; +char arg_output_path[PATH_MAX] = DEFAULT_OUTPUT; static void signal_handler(int sig) { if (sig++) @@ -114,19 +122,14 @@ static void parse_conf(void) { { "Bootchart", "PlotEntropyGraph", config_parse_bool, 0, &arg_entropy }, { "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 } }; - _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, 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); @@ -134,36 +137,73 @@ static void parse_conf(void) { strscpy(arg_output_path, sizeof(arg_output_path), output); } -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'}, - {"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 void help(void) { + fprintf(stdout, + "Usage: %s [OPTIONS]\n\n" + "Options:\n" + " -r, --rel Record time relative to recording\n" + " -f, --freq=FREQ Sample frequency [%g]\n" + " -n, --samples=N Stop sampling at [%d] samples\n" + " -x, --scale-x=N Scale the graph horizontally [%g] \n" + " -y, --scale-y=N Scale the graph vertically [%g] \n" + " -p, --pss Enable PSS graph (CPU intensive)\n" + " -e, --entropy Enable the entropy_avail graph\n" + " -o, --output=PATH Path to output files [%s]\n" + " -i, --init=PATH Path to init executable [%s]\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, + DEFAULT_HZ, + DEFAULT_SAMPLES_LEN, + DEFAULT_SCALE_X, + DEFAULT_SCALE_Y, + DEFAULT_OUTPUT, + DEFAULT_INIT); +} + +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' }, + {"per-cpu", no_argument, NULL, ARG_PERCPU}, + {} }; - int c; + int c, r; - while ((c = getopt_long(argc, argv, "erpf:n:o:i:FChx:y:", options, NULL)) >= 0) { - int r; + if (getpid() == 1) + opterr = 0; + while ((c = getopt_long(argc, argv, "erpf:n:o:i:FCchx:y:", options, NULL)) >= 0) switch (c) { + 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; @@ -171,11 +211,14 @@ static int parse_args(int argc, char *argv[]) { case 'C': arg_show_cmdline = true; break; + case 'c': + arg_show_cgroup = true; + break; 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); @@ -191,61 +234,46 @@ static int parse_args(int argc, char *argv[]) { 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) - 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; - case 'h': - fprintf(stderr, "Usage: %s [OPTIONS]\n", argv[0]); - fprintf(stderr, " --rel, -r Record time relative to recording\n"); - fprintf(stderr, " --freq, -f f Sample frequency [%f]\n", arg_hz); - fprintf(stderr, " --samples, -n N Stop sampling at [%d] samples\n", arg_samples_len); - fprintf(stderr, " --scale-x, -x N Scale the graph horizontally [%f] \n", arg_scale_x); - fprintf(stderr, " --scale-y, -y N Scale the graph vertically [%f] \n", arg_scale_y); - fprintf(stderr, " --pss, -p Enable PSS graph (CPU intensive)\n"); - fprintf(stderr, " --entropy, -e Enable the entropy_avail graph\n"); - fprintf(stderr, " --output, -o [PATH] Path to output files [%s]\n", arg_output_path); - fprintf(stderr, " --init, -i [PATH] Path to init executable [%s]\n", arg_init_path); - fprintf(stderr, " --no-filter, -F Disable filtering of processes from the graph\n"); - fprintf(stderr, " that are of less importance or short-lived\n"); - fprintf(stderr, " --cmdline, -C Display the full command line with arguments\n"); - fprintf(stderr, " of processes, instead of only the process name\n"); - fprintf(stderr, " --help, -h Display this message\n"); - fprintf(stderr, "See bootchart.conf for more information.\n"); - exit (EXIT_SUCCESS); + case ARG_PERCPU: + arg_percpu = true; break; + case 'h': + help(); + return 0; + case '?': + if (getpid() != 1) + return -EINVAL; + else + return 0; default: - break; + assert_not_reached("Unhandled option code."); } - } - - if (arg_samples_len > MAXSAMPLES) { - fprintf(stderr, "Error: samples exceeds maximum\n"); - return -EINVAL; - } - 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 0; + return 1; } -static void do_journal_append(char *file) -{ +static void do_journal_append(char *file) { struct iovec iovec[5]; int r, f, j = 0; ssize_t n; - char _cleanup_free_ *bootchart_file = NULL, *bootchart_message = NULL, + _cleanup_free_ char *bootchart_file = NULL, *bootchart_message = NULL, *p = NULL; bootchart_file = strappend("BOOTCHART_FILE=", file); @@ -260,20 +288,20 @@ static void do_journal_append(char *file) p = malloc(9 + BOOTCHART_MAX); if (!p) { - r = log_oom(); + log_oom(); return; } memcpy(p, "BOOTCHART=", 10); - f = open(file, O_RDONLY); + f = open(file, O_RDONLY|O_CLOEXEC); if (f < 0) { - log_error("Failed to read bootchart data: %m\n"); + log_error_errno(errno, "Failed to read bootchart data: %m"); return; } n = loop_read(f, p + 10, BOOTCHART_MAX, false); if (n < 0) { - log_error("Failed to read bootchart data: %s\n", strerror(-n)); + log_error_errno(n, "Failed to read bootchart data: %m"); close(f); return; } @@ -285,7 +313,7 @@ static void do_journal_append(char *file) 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[]) { @@ -299,17 +327,18 @@ int main(int argc, char *argv[]) { time_t t = 0; int r; struct rlimit rlim; + bool has_procfs = false; 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: - * - 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) { @@ -325,10 +354,10 @@ int main(int argc, char *argv[]) { (void) setrlimit(RLIMIT_NOFILE, &rlim); /* start with empty ps LL */ - ps_first = calloc(1, sizeof(struct ps_struct)); + ps_first = new0(struct ps_struct, 1); if (!ps_first) { - perror("calloc(ps_struct)"); - exit(EXIT_FAILURE); + log_oom(); + return EXIT_FAILURE; } /* handle TERM/INT nicely */ @@ -338,6 +367,18 @@ int main(int argc, char *argv[]) { 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 */ for (samples = 0; !exiting && samples < arg_samples_len; samples++) { int res; @@ -348,32 +389,41 @@ int main(int argc, char *argv[]) { double elapsed; double timeleft; - sampletime[samples] = gettime_ns(); + sampledata = new0(struct list_sample_data, 1); + if (sampledata == NULL) { + log_oom(); + return EXIT_FAILURE; + } + + sampledata->sampletime = gettime_ns(); + sampledata->counter = samples; 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, "w"); + of = fopen(output_file, "we"); } if (sysfd < 0) - sysfd = open("/sys", O_RDONLY); + sysfd = open("/sys", O_RDONLY|O_CLOEXEC); - if (!build) - parse_env_file("/etc/os-release", NEWLINE, - "PRETTY_NAME", &build, - NULL); + if (!build) { + if (parse_env_file("/etc/os-release", NEWLINE, "PRETTY_NAME", &build, NULL) == -ENOENT) + 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(); + if (has_procfs) + log_sample(samples, &sampledata); else - log_sample(samples); + /* wait for /proc to become available, discarding samples */ + has_procfs = access("/proc/vmstat", F_OK) == 0; sample_stop = gettime_ns(); - elapsed = (sample_stop - sampletime[samples]) * 1000000000.0; + elapsed = (sample_stop - sampledata->sampletime) * 1000000000.0; timeleft = interval - elapsed; newint_s = (time_t)(timeleft / 1000000000.0); @@ -395,14 +445,15 @@ int main(int argc, char *argv[]) { /* caught signal, probably HUP! */ break; } - perror("nanosleep()"); - exit (EXIT_FAILURE); + log_error_errno(errno, "nanosleep() failed: %m"); + exit(EXIT_FAILURE); } } else { overrun++; /* calculate how many samples we lost and scrap them */ arg_samples_len -= (int)(newint_ns / interval); } + LIST_PREPEND(link, head, sampledata); } /* do some cleanup, close fd's */ @@ -419,9 +470,11 @@ int main(int argc, char *argv[]) { 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, "w"); + of = fopen(output_file, "we"); } if (!of) { @@ -429,7 +482,7 @@ int main(int argc, char *argv[]) { exit (EXIT_FAILURE); } - svg_do(build); + svg_do(strna(build)); fprintf(stderr, "systemd-bootchart wrote %s\n", output_file); @@ -443,16 +496,34 @@ int main(int argc, char *argv[]) { close(sysfd); /* nitpic cleanups */ - ps = ps_first; + ps = ps_first->next_ps; while (ps->next_ps) { - struct ps_struct *old = ps; + struct ps_struct *old; + + old = ps; + old->sample = ps->first; ps = ps->next_ps; + while (old->sample->next) { + struct ps_sched_struct *oldsample = old->sample; + + old->sample = old->sample->next; + free(oldsample); + } + free(old->cgroup); free(old->sample); free(old); } + free(ps->cgroup); free(ps->sample); free(ps); + sampledata = head; + while (sampledata->link_prev) { + struct list_sample_data *old_sampledata = sampledata; + sampledata = sampledata->link_prev; + free(old_sampledata); + } + free(sampledata); /* don't complain when overrun once, happens most commonly on 1st sample */ if (overrun > 1) fprintf(stderr, "systemd-boochart: Warning: sample time overrun %i times\n", overrun);