lkml.org 
[lkml]   [2017]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 40/83] perf trace: Fix an exit code of trace__symbols_init
    Date
    From: Andrei Vagin <avagin@openvz.org>

    Currently if trace_event__register_resolver() fails, we return -errno,
    but we can't be sure that errno isn't zero in this case.

    Signed-off-by: Andrei Vagin <avagin@openvz.org>
    Reviewed-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Vasily Averin <vvs@virtuozzo.com>
    Link: http://lkml.kernel.org/r/20171108002246.8924-2-avagin@openvz.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-trace.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
    index f2757d38c7d7..84debdbad327 100644
    --- a/tools/perf/builtin-trace.c
    +++ b/tools/perf/builtin-trace.c
    @@ -1152,12 +1152,14 @@ static int trace__symbols_init(struct trace *trace, struct perf_evlist *evlist)
    if (trace->host == NULL)
    return -ENOMEM;

    - if (trace_event__register_resolver(trace->host, trace__machine__resolve_kernel_addr) < 0)
    - return -errno;
    + err = trace_event__register_resolver(trace->host, trace__machine__resolve_kernel_addr);
    + if (err < 0)
    + goto out;

    err = __machine__synthesize_threads(trace->host, &trace->tool, &trace->opts.target,
    evlist->threads, trace__tool_process, false,
    trace->opts.proc_map_timeout, 1);
    +out:
    if (err)
    symbol__exit();

    --
    2.13.6
    \
     
     \ /
      Last update: 2017-11-17 21:20    [W:2.694 / U:1.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site