X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbootchart%2Fbootchart.c;h=d6c63cd1297c9c3ea872df82cdc5096654c11297;hb=c4d58b0b6d238b955ece39a9dd9d3ca84b3408f3;hp=e608af2e3fae3b6cda50d882e4e1479bab2fa6b9;hpb=361514aca147f8826811c23cfac40c6ac995dfeb;p=elogind.git diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index e608af2e3..d6c63cd12 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "util.h" #include "fileio.h" @@ -96,20 +97,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 +116,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(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)); + + 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; @@ -233,14 +229,83 @@ int main(int argc, char *argv[]) { if (arg_samples_len > MAXSAMPLES) { fprintf(stderr, "Error: samples exceeds maximum\n"); - exit(EXIT_FAILURE); + return -EINVAL; } 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; + char _cleanup_free_ *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) { + r = log_oom(); + return; } + memcpy(p, "BOOTCHART=", 10); + + f = open(file, O_RDONLY); + if (f < 0) { + log_error("Failed to read bootchart data: %s\n", strerror(-errno)); + return; + } + n = loop_read(f, p + 10, BOOTCHART_MAX, false); + if (n < 0) { + log_error("Failed to read bootchart data: %s\n", 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: @@ -267,8 +332,6 @@ int main(int argc, char *argv[]) { } /* 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; @@ -276,7 +339,7 @@ int main(int argc, char *argv[]) { log_uptime(); /* main program loop */ - while (!exiting) { + for (samples = 0; !exiting && samples < arg_samples_len; samples++) { int res; double sample_stop; struct timespec req; @@ -303,7 +366,7 @@ 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); @@ -322,7 +385,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; @@ -338,14 +401,8 @@ int main(int argc, char *argv[]) { } 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; - } /* do some cleanup, close fd's */ @@ -376,6 +433,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);