lkml.org 
[lkml]   [2012]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/14] perf tools: Move parse_events error printing to parse_events_options
    Date
    From: Andi Kleen <ak@linux.intel.com>

    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 file 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,
    --
    1.7.9.2.358.g22243


    \
     
     \ /
      Last update: 2012-10-29 16:41    [W:4.195 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site