Messages in this thread Patch in this message | | | Date | Tue, 30 Oct 2012 04:58:58 -0700 | From | tip-bot for Andi Kleen <> | Subject | [tip:perf/core] perf tools: Move parse_events error printing to parse_events_options |
| |
Commit-ID: 9175ce1f1244edd9f4d39605aa06ce5b0a50b8e0 Gitweb: http://git.kernel.org/tip/9175ce1f1244edd9f4d39605aa06ce5b0a50b8e0 Author: Andi Kleen <ak@linux.intel.com> AuthorDate: Fri, 26 Oct 2012 13:30:06 -0700 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Sun, 28 Oct 2012 11:29:52 -0200
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> --- tools/perf/util/parse-events.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 3a3efcf..c0b785b 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -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,
| |