diff options
| -rw-r--r-- | src/bootchart/bootchart.c | 32 | ||||
| -rw-r--r-- | src/bootchart/bootchart.h | 2 | ||||
| -rw-r--r-- | src/bootchart/log.c | 2 | ||||
| -rw-r--r-- | src/bootchart/svg.c | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c index 543037dae1..e7c0b4942b 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -79,7 +79,7 @@ bool filter = true; bool show_cmdline = false; bool pss = false; int samples; -int len = 500; /* we record len+1 (1 start sample) */ +int samples_len = 500; /* we record len+1 (1 start sample) */ double hz = 25.0; /* 20 seconds log time */ double scale_x = 100.0; /* 100px = 1sec */ double scale_y = 20.0; /* 16px = 1 process bar */ @@ -112,16 +112,16 @@ int main(int argc, char *argv[]) char *init = NULL, *output = NULL; const ConfigTableItem items[] = { - { "Bootchart", "Samples", config_parse_int, 0, &len }, - { "Bootchart", "Frequency", config_parse_double, 0, &hz }, - { "Bootchart", "Relative", config_parse_bool, 0, &relative }, - { "Bootchart", "Filter", config_parse_bool, 0, &filter }, - { "Bootchart", "Output", config_parse_path, 0, &output }, - { "Bootchart", "Init", config_parse_path, 0, &init }, - { "Bootchart", "PlotMemoryUsage", config_parse_bool, 0, &pss }, - { "Bootchart", "PlotEntropyGraph", config_parse_bool, 0, &entropy }, - { "Bootchart", "ScaleX", config_parse_double, 0, &scale_x }, - { "Bootchart", "ScaleY", config_parse_double, 0, &scale_y }, + { "Bootchart", "Samples", config_parse_int, 0, &samples_len }, + { "Bootchart", "Frequency", config_parse_double, 0, &hz }, + { "Bootchart", "Relative", config_parse_bool, 0, &relative }, + { "Bootchart", "Filter", config_parse_bool, 0, &filter }, + { "Bootchart", "Output", config_parse_path, 0, &output }, + { "Bootchart", "Init", config_parse_path, 0, &init }, + { "Bootchart", "PlotMemoryUsage", config_parse_bool, 0, &pss }, + { "Bootchart", "PlotEntropyGraph", config_parse_bool, 0, &entropy }, + { "Bootchart", "ScaleX", config_parse_double, 0, &scale_x }, + { "Bootchart", "ScaleY", config_parse_double, 0, &scale_y }, { NULL, NULL, NULL, 0, NULL } }; @@ -181,7 +181,7 @@ int main(int argc, char *argv[]) show_cmdline = true; break; case 'n': - r = safe_atoi(optarg, &len); + r = safe_atoi(optarg, &samples_len); if (r < 0) log_warning("failed to parse --samples/-n argument '%s': %s", optarg, strerror(-r)); @@ -216,7 +216,7 @@ int main(int argc, char *argv[]) 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", hz); - fprintf(stderr, " --samples, -n N Stop sampling at [%d] samples\n", len); + fprintf(stderr, " --samples, -n N Stop sampling at [%d] samples\n", samples_len); fprintf(stderr, " --scale-x, -x N Scale the graph horizontally [%f] \n", scale_x); fprintf(stderr, " --scale-y, -y N Scale the graph vertically [%f] \n", scale_y); fprintf(stderr, " --pss, -p Enable PSS graph (CPU intensive)\n"); @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) } } - if (len > MAXSAMPLES) { + if (samples_len > MAXSAMPLES) { fprintf(stderr, "Error: samples exceeds maximum\n"); exit(EXIT_FAILURE); } @@ -339,12 +339,12 @@ int main(int argc, char *argv[]) } else { overrun++; /* calculate how many samples we lost and scrap them */ - len = len + ((int)(newint_ns / interval)); + samples_len = samples_len + ((int)(newint_ns / interval)); } samples++; - if (samples > len) + if (samples > samples_len) break; } diff --git a/src/bootchart/bootchart.h b/src/bootchart/bootchart.h index c42f97140a..0fe4d2f4da 100644 --- a/src/bootchart/bootchart.h +++ b/src/bootchart/bootchart.h @@ -107,7 +107,7 @@ extern bool entropy; extern bool initcall; extern int samples; extern int cpus; -extern int len; +extern int samples_len; extern double hz; extern double scale_x; extern double scale_y; diff --git a/src/bootchart/log.c b/src/bootchart/log.c index 1e3f4a9e8c..43999f23cf 100644 --- a/src/bootchart/log.c +++ b/src/bootchart/log.c @@ -264,7 +264,7 @@ schedstat_next: ps = ps->next_ps; ps->pid = pid; - ps->sample = calloc(len + 1, sizeof(struct ps_sched_struct)); + ps->sample = calloc(samples_len + 1, sizeof(struct ps_sched_struct)); if (!ps->sample) { perror("calloc(ps_struct)"); exit (EXIT_FAILURE); diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c index 4c78abda63..9fee810795 100644 --- a/src/bootchart/svg.c +++ b/src/bootchart/svg.c @@ -103,7 +103,7 @@ static void svg_header(void) svg("<!-- your browser to file:///run/log/ and click. This bootchart was -->\n\n"); svg("<!-- generated by bootchart version %s, running with options: -->\n", VERSION); - svg("<!-- hz=\"%f\" n=\"%d\" -->\n", hz, len); + svg("<!-- hz=\"%f\" n=\"%d\" -->\n", hz, samples_len); svg("<!-- x=\"%f\" y=\"%f\" -->\n", scale_x, scale_y); svg("<!-- rel=\"%d\" f=\"%d\" -->\n", relative, filter); svg("<!-- p=\"%d\" e=\"%d\" -->\n", pss, entropy); @@ -222,7 +222,7 @@ static void svg_title(const char *build) svg("Not detected"); svg("</text>\n"); svg("<text class=\"sec\" x=\"20\" y=\"155\">Graph data: %.03f samples/sec, recorded %i total, dropped %i samples, %i processes, %i filtered</text>\n", - hz, len, overrun, pscount, pfiltered); + hz, samples_len, overrun, pscount, pfiltered); } |