X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbootchart%2Fbootchart.c;h=fec63721a8246404a25cbf3dd2348bcd40ae0b6f;hp=288148f483e6349639f6440e9bfd5ba5b3a5ed09;hb=f168c27313e4d7b0aabee037dc9c78a5799f0597;hpb=1c6330456c5ae76085c63d2a7cf3d722596e545a diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 288148f48..fec63721a 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"; @@ -98,6 +98,8 @@ static void signal_handler(int sig) { #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[] = { @@ -120,8 +122,8 @@ static void parse_conf(void) { if (!f) return; - r = config_parse(BOOTCHART_CONF, f, - NULL, config_item_table_lookup, (void*) items, true, NULL); + 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)); @@ -224,11 +226,6 @@ static int parse_args(int argc, char *argv[]) { } } - 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"); return -EINVAL; @@ -237,6 +234,53 @@ static int parse_args(int argc, char *argv[]) { 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); + if (f < 0) { + log_error("Failed to read bootchart data: %m\n"); + 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 = { @@ -287,6 +331,8 @@ int main(int argc, char *argv[]) { log_uptime(); + LIST_HEAD_INIT(head); + /* main program loop */ for (samples = 0; !exiting && samples < arg_samples_len; samples++) { int res; @@ -297,7 +343,14 @@ 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); @@ -318,11 +371,11 @@ int main(int argc, char *argv[]) { 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); @@ -352,6 +405,7 @@ int main(int argc, char *argv[]) { /* 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 */ @@ -382,6 +436,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); @@ -390,16 +446,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);