Skip to content

Commit

Permalink
perf tools: Convert critical messages to ui__error()
Browse files Browse the repository at this point in the history 
There were places where use ui__warning (or even fprintf) to show
critical messages. This patch converts them to ui__error so that the
front-end code can implement appropriate behavior.

Signed-off-by: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Pekka Enberg <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
@namhyung @acmel
namhyung authored and acmel committed May 29, 2012
1 parent 21f0d42 commit 3780f48
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 27 deletions.
2 changes: 1 addition & 1 deletion tools/perf/builtin-annotate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
}

if (total_nr_samples == 0) {
ui__warning("The %s file has no samples!\n", session->filename);
ui__error("The %s file has no samples!\n", session->filename);
goto out_delete;
}
out_delete:
Expand Down
14 changes: 7 additions & 7 deletions tools/perf/builtin-record.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static void perf_record__open(struct perf_record *rec)
}

if (err == ENOENT) {
ui__warning("The %s event is not supported.\n",
ui__error("The %s event is not supported.\n",
event_name(pos));
exit(EXIT_FAILURE);
}
Expand Down Expand Up @@ -858,8 +858,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
usage_with_options(record_usage, record_options);

if (rec->force && rec->append_file) {
fprintf(stderr, "Can't overwrite and append at the same time."
" You need to choose between -f and -A");
ui__error("Can't overwrite and append at the same time."
" You need to choose between -f and -A");
usage_with_options(record_usage, record_options);
} else if (rec->append_file) {
rec->write_mode = WRITE_APPEND;
Expand All @@ -868,8 +868,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
}

if (nr_cgroups && !rec->opts.target.system_wide) {
fprintf(stderr, "cgroup monitoring only available in"
" system-wide mode\n");
ui__error("cgroup monitoring only available in"
" system-wide mode\n");
usage_with_options(record_usage, record_options);
}

Expand Down Expand Up @@ -905,7 +905,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
int saved_errno = errno;

perf_target__strerror(&rec->opts.target, err, errbuf, BUFSIZ);
ui__warning("%s", errbuf);
ui__error("%s", errbuf);

err = -saved_errno;
goto out_free_fd;
Expand Down Expand Up @@ -933,7 +933,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
else if (rec->opts.freq) {
rec->opts.default_interval = rec->opts.freq;
} else {
fprintf(stderr, "frequency and count are zero, aborting\n");
ui__error("frequency and count are zero, aborting\n");
err = -EINVAL;
goto out_free_fd;
}
Expand Down
14 changes: 6 additions & 8 deletions tools/perf/builtin-report.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,13 @@ static int perf_report__setup_sample_type(struct perf_report *rep)

if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
if (sort__has_parent) {
ui__warning("Selected --sort parent, but no "
ui__error("Selected --sort parent, but no "
"callchain data. Did you call "
"'perf record' without -g?\n");
return -EINVAL;
}
if (symbol_conf.use_callchain) {
ui__warning("Selected -g but no callchain data. Did "
ui__error("Selected -g but no callchain data. Did "
"you call 'perf record' without -g?\n");
return -1;
}
Expand All @@ -266,17 +266,15 @@ static int perf_report__setup_sample_type(struct perf_report *rep)
!symbol_conf.use_callchain) {
symbol_conf.use_callchain = true;
if (callchain_register_param(&callchain_param) < 0) {
ui__warning("Can't register callchain "
"params.\n");
ui__error("Can't register callchain params.\n");
return -EINVAL;
}
}

if (sort__branch_mode == 1) {
if (!(self->sample_type & PERF_SAMPLE_BRANCH_STACK)) {
fprintf(stderr, "selected -b but no branch data."
" Did you call perf record without"
" -b?\n");
ui__error("Selected -b but no branch data. "
"Did you call perf record without -b?\n");
return -1;
}
}
Expand Down Expand Up @@ -420,7 +418,7 @@ static int __cmd_report(struct perf_report *rep)
}

if (nr_samples == 0) {
ui__warning("The %s file has no samples!\n", session->filename);
ui__error("The %s file has no samples!\n", session->filename);
goto out_delete;
}

Expand Down
22 changes: 11 additions & 11 deletions tools/perf/builtin-top.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,16 +959,16 @@ static void perf_top__start_counters(struct perf_top *top)
}

if (err == ENOENT) {
ui__warning("The %s event is not supported.\n",
ui__error("The %s event is not supported.\n",
event_name(counter));
goto out_err;
} else if (err == EMFILE) {
ui__warning("Too many events are opened.\n"
ui__error("Too many events are opened.\n"
"Try again after reducing the number of events\n");
goto out_err;
}

ui__warning("The sys_perf_event_open() syscall "
ui__error("The sys_perf_event_open() syscall "
"returned with %d (%s). /bin/dmesg "
"may provide additional information.\n"
"No CONFIG_PERF_EVENTS=y kernel support "
Expand All @@ -978,7 +978,7 @@ static void perf_top__start_counters(struct perf_top *top)
}

if (perf_evlist__mmap(evlist, top->mmap_pages, false) < 0) {
ui__warning("Failed to mmap with %d (%s)\n",
ui__error("Failed to mmap with %d (%s)\n",
errno, strerror(errno));
goto out_err;
}
Expand All @@ -994,12 +994,12 @@ static int perf_top__setup_sample_type(struct perf_top *top)
{
if (!top->sort_has_symbols) {
if (symbol_conf.use_callchain) {
ui__warning("Selected -g but \"sym\" not present in --sort/-s.");
ui__error("Selected -g but \"sym\" not present in --sort/-s.");
return -EINVAL;
}
} else if (!top->dont_use_callchains && callchain_param.mode != CHAIN_NONE) {
if (callchain_register_param(&callchain_param) < 0) {
ui__warning("Can't register callchain params.\n");
ui__error("Can't register callchain params.\n");
return -EINVAL;
}
}
Expand Down Expand Up @@ -1041,7 +1041,7 @@ static int __cmd_top(struct perf_top *top)

if (pthread_create(&thread, NULL, (use_browser > 0 ? display_thread_tui :
display_thread), top)) {
printf("Could not create display thread.\n");
ui__error("Could not create display thread.\n");
exit(-1);
}

Expand All @@ -1050,7 +1050,7 @@ static int __cmd_top(struct perf_top *top)

param.sched_priority = top->realtime_prio;
if (sched_setscheduler(0, SCHED_FIFO, &param)) {
printf("Could not set realtime priority.\n");
ui__error("Could not set realtime priority.\n");
exit(-1);
}
}
Expand Down Expand Up @@ -1274,7 +1274,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
int saved_errno = errno;

perf_target__strerror(&top.target, status, errbuf, BUFSIZ);
ui__warning("%s", errbuf);
ui__error("%s", errbuf);

status = -saved_errno;
goto out_delete_evlist;
Expand All @@ -1288,7 +1288,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)

if (!top.evlist->nr_entries &&
perf_evlist__add_default(top.evlist) < 0) {
pr_err("Not enough memory for event selector list\n");
ui__error("Not enough memory for event selector list\n");
return -ENOMEM;
}

Expand All @@ -1305,7 +1305,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
else if (top.freq) {
top.default_interval = top.freq;
} else {
fprintf(stderr, "frequency and count are zero, aborting\n");
ui__error("frequency and count are zero, aborting\n");
exit(EXIT_FAILURE);
}

Expand Down

0 comments on commit 3780f48

Please sign in to comment.