picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bootchart: switch to log_* helpers

Browse source 
Let the helper functions take care of the string message output.
This commit is contained in:
Daniel Mack 2015-04-02 13:24:30 +02:00
parent 61192f1d69
commit 0399586320
3 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/bootchart/bootchart.c
View file

@ -135,31 +135,30 @@ static void parse_conf(void) {
}
static void help(void) {
fprintf(stdout,
"Usage: %s [OPTIONS]\n\n"
"Options:\n"
" -r, --rel Record time relative to recording\n"
" -f, --freq=FREQ Sample frequency [%g]\n"
" -n, --samples=N Stop sampling at [%d] samples\n"
" -x, --scale-x=N Scale the graph horizontally [%g] \n"
" -y, --scale-y=N Scale the graph vertically [%g] \n"
" -p, --pss Enable PSS graph (CPU intensive)\n"
" -e, --entropy Enable the entropy_avail graph\n"
" -o, --output=PATH Path to output files [%s]\n"
" -i, --init=PATH Path to init executable [%s]\n"
" -F, --no-filter Disable filtering of unimportant or ephemeral processes\n"
" -C, --cmdline Display full command lines with arguments\n"
" -c, --control-group Display process control group\n"
" --per-cpu Draw each CPU utilization and wait bar also\n"
" -h, --help Display this message\n\n"
"See bootchart.conf for more information.\n",
program_invocation_short_name,
DEFAULT_HZ,
DEFAULT_SAMPLES_LEN,
DEFAULT_SCALE_X,
DEFAULT_SCALE_Y,
DEFAULT_OUTPUT,
DEFAULT_INIT);
printf("Usage: %s [OPTIONS]\n\n"
"Options:\n"
" -r --rel Record time relative to recording\n"
" -f --freq=FREQ Sample frequency [%g]\n"
" -n --samples=N Stop sampling at [%d] samples\n"
" -x --scale-x=N Scale the graph horizontally [%g] \n"
" -y --scale-y=N Scale the graph vertically [%g] \n"
" -p --pss Enable PSS graph (CPU intensive)\n"
" -e --entropy Enable the entropy_avail graph\n"
" -o --output=PATH Path to output files [%s]\n"
" -i --init=PATH Path to init executable [%s]\n"
" -F --no-filter Disable filtering of unimportant or ephemeral processes\n"
" -C --cmdline Display full command lines with arguments\n"
" -c --control-group Display process control group\n"
" --per-cpu Draw each CPU utilization and wait bar also\n"
" -h --help Display this message\n\n"
"See bootchart.conf for more information.\n",
program_invocation_short_name,
DEFAULT_HZ,
DEFAULT_SAMPLES_LEN,
DEFAULT_SCALE_X,
DEFAULT_SCALE_Y,
DEFAULT_OUTPUT,
DEFAULT_INIT);
}
static int parse_argv(int argc, char *argv[]) {
@ -365,10 +364,9 @@ int main(int argc, char *argv[]) {
log_uptime();
if (graph_start < 0.0) {
fprintf(stderr,
"Failed to setup graph start time.\n\nThe system uptime "
"probably includes time that the system was suspended. "
"Use --rel to bypass this issue.\n");
log_error("Failed to setup graph start time.\n\n"
"The system uptime probably includes time that the system was suspended. "
"Use --rel to bypass this issue.");
exit (EXIT_FAILURE);
}
@ -514,7 +512,7 @@ int main(int argc, char *argv[]) {
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);
log_warning("systemd-boochart: sample time overrun %i times\n", overrun);
return 0;
}

6
src/bootchart/store.c
View file

@ -143,10 +143,8 @@ void log_sample(int sample, struct list_sample_data **ptr) {
if (vmstat < 0) {
/* block stuff */
vmstat = openat(procfd, "vmstat", O_RDONLY);
if (vmstat == -1) {
log_error_errno(errno, "Failed to open /proc/vmstat: %m");
exit(EXIT_FAILURE);
}
if (vmstat == -1)
return log_error_errno(errno, "Failed to open /proc/vmstat: %m");
}
n = pread(vmstat, buf, sizeof(buf) - 1, 0);

4
src/bootchart/svg.c
View file

@ -186,7 +186,7 @@ static void svg_title(const char *build) {
f = fdopen(fd, "r");
if (f) {
if (!fgets(model, 255, f))
fprintf(stderr, "Error reading disk model for %s\n", rootbdev);
log_error("Error reading disk model for %s: %m\n", rootbdev);
fclose(f);
} else {
if (fd >= 0)
@ -196,7 +196,7 @@ static void svg_title(const char *build) {
/* various utsname parameters */
if (uname(&uts))
fprintf(stderr, "Error getting uname info\n");
log_error("Error getting uname info\n");
/* date */
t = time(NULL);