{ NULL, NULL, NULL, 0, NULL }
};
- config_parse(NULL, BOOTCHART_CONF, NULL,
- NULL,
- config_item_table_lookup, items,
- true, false, true, NULL);
+ config_parse_many(BOOTCHART_CONF,
+ CONF_DIRS_NULSTR("systemd/bootchart.conf"),
+ NULL, config_item_table_lookup, items, true, NULL);
if (init != NULL)
strscpy(arg_init_path, sizeof(arg_init_path), init);
DEFAULT_INIT);
}
-static int parse_args(int argc, char *argv[]) {
+static int parse_argv(int argc, char *argv[]) {
static const struct option options[] = {
{"rel", no_argument, NULL, 'r'},
{"freq", required_argument, NULL, 'f'},
{"entropy", no_argument, NULL, 'e'},
{}
};
- int c;
+ int c, r;
- while ((c = getopt_long(argc, argv, "erpf:n:o:i:FCchx:y:", options, NULL)) >= 0) {
- int r;
+ if (getpid() == 1)
+ opterr = 0;
+ while ((c = getopt_long(argc, argv, "erpf:n:o:i:FCchx:y:", options, NULL)) >= 0)
switch (c) {
+
case 'r':
arg_relative = true;
break;
case 'f':
r = safe_atod(optarg, &arg_hz);
if (r < 0)
- log_warning("failed to parse --freq/-f argument '%s': %s",
- optarg, strerror(-r));
+ log_warning_errno(r, "failed to parse --freq/-f argument '%s': %m",
+ optarg);
break;
case 'F':
arg_filter = false;
case 'n':
r = safe_atoi(optarg, &arg_samples_len);
if (r < 0)
- log_warning("failed to parse --samples/-n argument '%s': %s",
- optarg, strerror(-r));
+ log_warning_errno(r, "failed to parse --samples/-n argument '%s': %m",
+ optarg);
break;
case 'o':
path_kill_slashes(optarg);
case 'x':
r = safe_atod(optarg, &arg_scale_x);
if (r < 0)
- log_warning("failed to parse --scale-x/-x argument '%s': %s",
- optarg, strerror(-r));
+ log_warning_errno(r, "failed to parse --scale-x/-x argument '%s': %m",
+ optarg);
break;
case 'y':
r = safe_atod(optarg, &arg_scale_y);
if (r < 0)
- log_warning("failed to parse --scale-y/-y argument '%s': %s",
- optarg, strerror(-r));
+ log_warning_errno(r, "failed to parse --scale-y/-y argument '%s': %m",
+ optarg);
break;
case 'e':
arg_entropy = true;
break;
case 'h':
help();
- exit (EXIT_SUCCESS);
+ return 0;
+ case '?':
+ if (getpid() != 1)
+ return -EINVAL;
+ else
+ return 0;
default:
- break;
+ assert_not_reached("Unhandled option code.");
}
- }
- if (arg_hz <= 0.0) {
- fprintf(stderr, "Error: Frequency needs to be > 0\n");
+ if (arg_hz <= 0) {
+ log_error("Frequency needs to be > 0");
return -EINVAL;
}
- return 0;
+ return 1;
}
static void do_journal_append(char *file) {
f = open(file, O_RDONLY|O_CLOEXEC);
if (f < 0) {
- log_error("Failed to read bootchart data: %m");
+ log_error_errno(errno, "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));
+ log_error_errno(n, "Failed to read bootchart data: %m");
close(f);
return;
}
r = sd_journal_sendv(iovec, j);
if (r < 0)
- log_error("Failed to send bootchart: %s", strerror(-r));
+ log_error_errno(r, "Failed to send bootchart: %m");
}
int main(int argc, char *argv[]) {
parse_conf();
- r = parse_args(argc, argv);
- if (r < 0)
- return EXIT_FAILURE;
+ r = parse_argv(argc, argv);
+ if (r <= 0)
+ return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
/*
* If the kernel executed us through init=/usr/lib/systemd/systemd-bootchart, then
sampledata = new0(struct list_sample_data, 1);
if (sampledata == NULL) {
- log_error("Failed to allocate memory for a node: %m");
- return -1;
+ log_oom();
+ return EXIT_FAILURE;
}
sampledata->sampletime = gettime_ns();
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));
+ r = strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+ assert_se(r > 0);
+
snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
of = fopen(output_file, "we");
}
/* caught signal, probably HUP! */
break;
}
- log_error("nanosleep() failed: %m");
+ log_error_errno(errno, "nanosleep() failed: %m");
exit(EXIT_FAILURE);
}
} else {
if (!of) {
t = time(NULL);
- strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+ r = strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
+ assert_se(r > 0);
+
snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
of = fopen(output_file, "we");
}
exit (EXIT_FAILURE);
}
- svg_do(build);
+ svg_do(strna(build));
fprintf(stderr, "systemd-bootchart wrote %s\n", output_file);