]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
perf hists: Make hist_entry__has_callchains() work with 'perf c2c'
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 7 Jun 2018 17:27:19 +0000 (14:27 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 7 Jun 2018 17:27:19 +0000 (14:27 -0300)
Since 'perf c2c' uses 'struct hists' not allocated together with a
'struct perf_evsel' instance, we can't go from a 'struct hist_entry'
pointer to a 'struct perf_evsel' via he->hists, so, instead, check if
space was set aside for hist_entry->callchain[0] at hist_entry__new()
time.

Reported-by: Jin Yao <yao.jin@linux.intel.com>
Reported-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: fabd37b837f6 ("perf hists: Check if a hist_entry has callchains before using them")
Link: https://lkml.kernel.org/n/tip-e8ife8djvvvwmeze3s4yodii@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/sort.h

index 9ab9257ed887958ede406047bf7be65c4e95a2db..8bf302cafcecd6b285d68e2b2c56130019dea101 100644 (file)
@@ -155,7 +155,7 @@ struct hist_entry {
 
 static __pure inline bool hist_entry__has_callchains(struct hist_entry *he)
 {
-       return hists__has_callchains(he->hists);
+       return he->callchain_size != 0;
 }
 
 static inline bool hist_entry__has_pairs(struct hist_entry *he)