lkml.org 
[lkml]   [2014]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf callchain: Fix appending a callchain from a previous sample
    Commit-ID:  4d40b051b1ac41ecbc818deed27750b4c1697520
    Gitweb: http://git.kernel.org/tip/4d40b051b1ac41ecbc818deed27750b4c1697520
    Author: Adrian Hunter <adrian.hunter@intel.com>
    AuthorDate: Mon, 14 Jul 2014 13:02:35 +0300
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Wed, 16 Jul 2014 17:57:35 -0300

    perf callchain: Fix appending a callchain from a previous sample

    hist_entry__append_callchain() must check if the sample has a callcahin
    or it will append the callchain from a previous sample.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Namhyung Kim <namhyung@gmail.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/r/1405332185-4050-12-git-send-email-adrian.hunter@intel.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/callchain.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
    index 48b6d3f..437ee09 100644
    --- a/tools/perf/util/callchain.c
    +++ b/tools/perf/util/callchain.c
    @@ -626,7 +626,7 @@ int sample__resolve_callchain(struct perf_sample *sample, struct symbol **parent

    int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *sample)
    {
    - if (!symbol_conf.use_callchain)
    + if (!symbol_conf.use_callchain || sample->callchain == NULL)
    return 0;
    return callchain_append(he->callchain, &callchain_cursor, sample->period);
    }

    \
     
     \ /
      Last update: 2014-07-18 08:41    [W:2.356 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site