[PATCH 32/46] perf hists: Introduce hist_entry__has_callchain() method

Arnaldo Carvalho de Melo
2018-06-05T17:52:24Z

We'll use this helper more frequently when reworking
symbol_conf.use_callchain logic, where knowing if a hist_entry has
callchains is the important bit, so make going from hist_entry to hists
to evsel easier, compact.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-qg8nadz3p7fuufzjx1z2orf0@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/hist.c | 3 +--
tools/perf/util/sort.h | 6 ++++++
2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 496913eeed75..6173dd489f39 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -461,7 +461,6 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template,
bool sample_self)
{
struct hist_entry_ops *ops = template->ops;
- struct perf_evsel *evsel = hists_to_evsel(template->hists);
size_t callchain_size = 0;
struct hist_entry *he;
int err = 0;
@@ -473,7 +472,7 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template,
* e.g.: 'perf record -e cycles,cache-misses/max-stack=10/', so lets
* not waste space for that.
*/
- if (symbol_conf.use_callchain && evsel__has_callchain(evsel))
+ if (hist_entry__has_callchains(template) && symbol_conf.use_callchain)
callchain_size = sizeof(struct callchain_root);

he = ops->new(callchain_size);
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index f007a26d6f6d..1a046157bfef 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -151,6 +151,12 @@ struct hist_entry {
struct callchain_root callchain[0]; /* must be last member */
};

+static __pure inline bool hist_entry__has_callchains(struct hist_entry *he)
+{
+ const struct perf_evsel *evsel = hists_to_evsel(he->hists);
+ return evsel__has_callchain(evsel);
+}
+
static inline bool hist_entry__has_pairs(struct hist_entry *he)
{
return !list_empty(&he->pairs.node);
--
2.14.3