X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbootchart%2Fbootchart.c;h=9f72d98126c1b4d8e02934b0e6fd0932835ea1ea;hb=4ef0809c22a7d15bae3865d44596ff6e3cdaf1cb;hp=e608af2e3fae3b6cda50d882e4e1479bab2fa6b9;hpb=361514aca147f8826811c23cfac40c6ac995dfeb;p=elogind.git diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index e608af2e3..9f72d9812 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,6 +48,7 @@ #include #include #include +#include #include "util.h" #include "fileio.h" @@ -58,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; @@ -86,6 +84,8 @@ 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 */ +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"; @@ -96,20 +96,12 @@ static void signal_handler(int sig) { exiting = 1; } -int main(int argc, char *argv[]) { - _cleanup_free_ char *build = NULL; - struct sigaction sig; - struct ps_struct *ps; - char output_file[PATH_MAX]; - char datestr[200]; - time_t t = 0; - const char *fn; - _cleanup_fclose_ FILE *f; - int gind; - int i, r; - char *init = NULL, *output = NULL; - struct rlimit rlim; +#define BOOTCHART_CONF "/etc/systemd/bootchart.conf" + +#define BOOTCHART_MAX (16*1024*1024) +static void parse_conf(void) { + char *init = NULL, *output = NULL; const ConfigTableItem items[] = { { "Bootchart", "Samples", config_parse_int, 0, &arg_samples_len }, { "Bootchart", "Frequency", config_parse_double, 0, &arg_hz }, @@ -123,43 +115,46 @@ int main(int argc, char *argv[]) { { "Bootchart", "ScaleY", config_parse_double, 0, &arg_scale_y }, { NULL, NULL, NULL, 0, NULL } }; + _cleanup_fclose_ FILE *f; + int r; - fn = "/etc/systemd/bootchart.conf"; - f = fopen(fn, "re"); - if (f) { - r = config_parse(fn, f, NULL, config_item_table_lookup, (void*) items, true, NULL); - if (r < 0) - log_warning("Failed to parse configuration file: %s", strerror(-r)); - - if (init != NULL) - strscpy(arg_init_path, sizeof(arg_init_path), init); - if (output != NULL) - strscpy(arg_output_path, sizeof(arg_output_path), output); - } + f = fopen(BOOTCHART_CONF, "re"); + if (!f) + return; - while (1) { - static struct option opts[] = { - {"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} - }; - - gind = 0; - - i = getopt_long(argc, argv, "erpf:n:o:i:FChx:y:", opts, &gind); - if (i == -1) - break; - switch (i) { + 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)); + + if (init != NULL) + strscpy(arg_init_path, sizeof(arg_init_path), init); + if (output != NULL) + 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} + }; + int c; + + while ((c = getopt_long(argc, argv, "erpf:n:o:i:FChx:y:", options, NULL)) >= 0) { + int r; + + switch (c) { case 'r': arg_relative = true; break; @@ -225,22 +220,84 @@ int main(int argc, char *argv[]) { fprintf(stderr, " --help, -h Display this message\n"); fprintf(stderr, "See bootchart.conf for more information.\n"); exit (EXIT_SUCCESS); - break; default: break; } } - if (arg_samples_len > MAXSAMPLES) { - fprintf(stderr, "Error: samples exceeds maximum\n"); - exit(EXIT_FAILURE); - } - if (arg_hz <= 0.0) { fprintf(stderr, "Error: Frequency needs to be > 0\n"); - exit(EXIT_FAILURE); + return -EINVAL; } + return 0; +} + +static void do_journal_append(char *file) { + struct iovec iovec[5]; + int r, f, j = 0; + ssize_t n; + _cleanup_free_ char *bootchart_file = NULL, *bootchart_message = NULL, + *p = NULL; + + bootchart_file = strappend("BOOTCHART_FILE=", file); + if (bootchart_file) + IOVEC_SET_STRING(iovec[j++], bootchart_file); + + IOVEC_SET_STRING(iovec[j++], "MESSAGE_ID=9f26aa562cf440c2b16c773d0479b518"); + IOVEC_SET_STRING(iovec[j++], "PRIORITY=7"); + bootchart_message = strjoin("MESSAGE=Bootchart created: ", file, NULL); + if (bootchart_message) + IOVEC_SET_STRING(iovec[j++], bootchart_message); + + p = malloc(9 + BOOTCHART_MAX); + if (!p) { + log_oom(); + return; + } + + memcpy(p, "BOOTCHART=", 10); + + f = open(file, O_RDONLY|O_CLOEXEC); + if (f < 0) { + log_error("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", strerror(-n)); + close(f); + return; + } + close(f); + + iovec[j].iov_base = p; + iovec[j].iov_len = 10 + n; + j++; + + r = sd_journal_sendv(iovec, j); + if (r < 0) + log_error("Failed to send bootchart: %s", strerror(-r)); +} + +int main(int argc, char *argv[]) { + _cleanup_free_ char *build = NULL; + struct sigaction sig = { + .sa_handler = signal_handler, + }; + struct ps_struct *ps; + char output_file[PATH_MAX]; + char datestr[200]; + time_t t = 0; + int r; + struct rlimit rlim; + + parse_conf(); + + r = parse_args(argc, argv); + if (r < 0) + return EXIT_FAILURE; + /* * If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then * fork: @@ -260,23 +317,23 @@ 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 */ - memset(&sig, 0, sizeof(struct sigaction)); - sig.sa_handler = signal_handler; sigaction(SIGHUP, &sig, NULL); interval = (1.0 / arg_hz) * 1000000000.0; log_uptime(); + LIST_HEAD_INIT(head); + /* main program loop */ - while (!exiting) { + for (samples = 0; !exiting && samples < arg_samples_len; samples++) { int res; double sample_stop; struct timespec req; @@ -285,17 +342,24 @@ 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_error("Failed to allocate memory for a node: %m"); + return -1; + } + + 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)); 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, @@ -303,14 +367,14 @@ int main(int argc, char *argv[]) { NULL); /* wait for /proc to become available, discarding samples */ - if (!(graph_start > 0.0)) + if (graph_start <= 0.0) log_uptime(); else - log_sample(samples); + log_sample(samples, &sampledata); 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); @@ -322,7 +386,7 @@ int main(int argc, char *argv[]) { * we'll lose all the missed samples and overrun our total * time */ - if ((newint_ns > 0) || (newint_s > 0)) { + if (newint_ns > 0 || newint_s > 0) { req.tv_sec = newint_s; req.tv_nsec = newint_ns; @@ -332,20 +396,15 @@ int main(int argc, char *argv[]) { /* caught signal, probably HUP! */ break; } - perror("nanosleep()"); - exit (EXIT_FAILURE); + log_error("nanosleep() failed: %m"); + exit(EXIT_FAILURE); } } else { overrun++; /* calculate how many samples we lost and scrap them */ - arg_samples_len = arg_samples_len + ((int)(newint_ns / interval)); + arg_samples_len -= (int)(newint_ns / interval); } - - samples++; - - if (samples > arg_samples_len) - break; - + LIST_PREPEND(link, head, sampledata); } /* do some cleanup, close fd's */ @@ -364,7 +423,7 @@ int main(int argc, char *argv[]) { t = time(NULL); strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t)); 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) { @@ -376,6 +435,8 @@ int main(int argc, char *argv[]) { fprintf(stderr, "systemd-bootchart wrote %s\n", output_file); + do_journal_append(output_file); + if (of) fclose(of); @@ -384,16 +445,32 @@ 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->sample); free(old); } 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);