perf tools: Move parse_events error printing to parse_events_options
The callers of parse_events usually have their own error handling. Move the fprintf for a bad event to parse_events_options, which is the only one who should need it. Signed-off-by: Andi Kleen <ak@linux.intel.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1351283415-13170-25-git-send-email-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
9db5506494
Коммит
9175ce1f12
|
@ -827,8 +827,6 @@ int parse_events(struct perf_evlist *evlist, const char *str,
|
|||
* Both call perf_evlist__delete in case of error, so we dont
|
||||
* need to bother.
|
||||
*/
|
||||
fprintf(stderr, "invalid or unsupported event: '%s'\n", str);
|
||||
fprintf(stderr, "Run 'perf list' for a list of valid events\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -836,7 +834,13 @@ int parse_events_option(const struct option *opt, const char *str,
|
|||
int unset __maybe_unused)
|
||||
{
|
||||
struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
|
||||
return parse_events(evlist, str, unset);
|
||||
int ret = parse_events(evlist, str, unset);
|
||||
|
||||
if (ret) {
|
||||
fprintf(stderr, "invalid or unsupported event: '%s'\n", str);
|
||||
fprintf(stderr, "Run 'perf list' for a list of valid events\n");
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
int parse_filter(const struct option *opt, const char *str,
|
||||
|
|
Загрузка…
Ссылка в новой задаче