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=b73319123fffbe6e53d1a0e7af5299d2d86965bc;hpb=db5c0122853a9ecf1cc92e6593461932df2fa866;p=elogind.git diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index b73319123..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 @@ -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; @@ -87,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"; @@ -221,17 +220,11 @@ static int parse_args(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"); - return -EINVAL; - } - if (arg_hz <= 0.0) { fprintf(stderr, "Error: Frequency needs to be > 0\n"); return -EINVAL; @@ -240,8 +233,7 @@ static int parse_args(int argc, char *argv[]) { return 0; } -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; @@ -260,20 +252,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("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("Failed to read bootchart data: %s", strerror(-n)); close(f); return; } @@ -325,10 +317,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 +330,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; @@ -348,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, @@ -369,11 +370,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); @@ -395,14 +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 -= (int)(newint_ns / interval); } + LIST_PREPEND(link, head, sampledata); } /* do some cleanup, close fd's */ @@ -421,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) { @@ -443,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);