perf evsel: Add has_callchain() helper to make code more compact/clear

Its common to have the (evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN),
so add an evsel__has_callchain(evsel) helper.

This will actually get more uses as we check that instead of
symbol_conf.use_callchain in places where that produces the same result
but makes this decision to be more fine grained, per evsel.

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-145340oytbthatpfeaq1do18@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 4dfdee668b0ca94aaa51f0cd1322cc3dba283bdb..97f9e755e8e68d3f01498a8abe6753fe006ee073 100644 (file)
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -2933,8 +2933,7 @@ static int timehist_check_attr(struct perf_sched *sched,
                        return -1;
                }
 
-               if (sched->show_callchain &&
-                   !(evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN)) {
+               if (sched->show_callchain && !evsel__has_callchain(evsel)) {
                        pr_info("Samples do not have callchains.\n");
                        sched->show_callchain = 0;
                        symbol_conf.use_callchain = 0;

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index cefc8813e91e5a84c3e7ad876827ecfb91dbe212..48e940efb3cb9b42e8132ab4d56aaf9faef11f17 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -517,7 +517,7 @@ static int perf_session__check_output_opt(struct perf_session *session)
 
                evlist__for_each_entry(session->evlist, evsel) {
                        not_pipe = true;
-                       if (evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN) {
+                       if (evsel__has_callchain(evsel)) {
                                use_callchain = true;
                                break;
                        }
@@ -532,22 +532,18 @@ static int perf_session__check_output_opt(struct perf_session *session)
         */
        if (symbol_conf.use_callchain &&
            !output[PERF_TYPE_TRACEPOINT].user_set) {
-               struct perf_event_attr *attr;
-
                j = PERF_TYPE_TRACEPOINT;
 
                evlist__for_each_entry(session->evlist, evsel) {
                        if (evsel->attr.type != j)
                                continue;
 
-                       attr = &evsel->attr;
-
-                       if (attr->sample_type & PERF_SAMPLE_CALLCHAIN) {
+                       if (evsel__has_callchain(evsel)) {
                                output[j].fields |= PERF_OUTPUT_IP;
                                output[j].fields |= PERF_OUTPUT_SYM;
                                output[j].fields |= PERF_OUTPUT_SYMOFFSET;
                                output[j].fields |= PERF_OUTPUT_DSO;
-                               set_print_ip_opts(attr);
+                               set_print_ip_opts(&evsel->attr);
                                goto out;
                        }
                }

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 560aed7da36a44df845928d3b46c627e27cc71d3..6a748eca2edb4231a2517ae3d12e2023ca6bd076 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2491,7 +2491,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
         * to override an explicitely set --max-stack global setting.
         */
        evlist__for_each_entry(evlist, evsel) {
-               if ((evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN) &&
+               if (evsel__has_callchain(evsel) &&
                    evsel->attr.sample_max_stack == 0)
                        evsel->attr.sample_max_stack = trace->max_stack;
        }

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index b9ebe15afb1384e5a034f486cf145f2dd8f0773b..7d40770684549d8691d63a403816b76b5bb7c3ad 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -499,7 +499,7 @@ static int test__checkevent_pmu_partial_time_callgraph(struct perf_evlist *evlis
         * while this test executes only parse events method.
         */
        TEST_ASSERT_VAL("wrong period",     0 == evsel->attr.sample_period);
-       TEST_ASSERT_VAL("wrong callgraph",  !(PERF_SAMPLE_CALLCHAIN & evsel->attr.sample_type));
+       TEST_ASSERT_VAL("wrong callgraph",  !evsel__has_callchain(evsel));
        TEST_ASSERT_VAL("wrong time",  !(PERF_SAMPLE_TIME & evsel->attr.sample_type));
 
        /* cpu/config=2,call-graph=no,time=0,period=2000/ */
@@ -512,7 +512,7 @@ static int test__checkevent_pmu_partial_time_callgraph(struct perf_evlist *evlis
         * while this test executes only parse events method.
         */
        TEST_ASSERT_VAL("wrong period",     0 == evsel->attr.sample_period);
-       TEST_ASSERT_VAL("wrong callgraph",  !(PERF_SAMPLE_CALLCHAIN & evsel->attr.sample_type));
+       TEST_ASSERT_VAL("wrong callgraph",  !evsel__has_callchain(evsel));
        TEST_ASSERT_VAL("wrong time",  !(PERF_SAMPLE_TIME & evsel->attr.sample_type));
 
        return 0;

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 150db5ed7400e3ea374477e233b5255dff49215d..94fce4f537e91c70eef03f569d1c2e76ded0dc9d 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2197,7 +2197,7 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
                }
        }
 
-       if (type & PERF_SAMPLE_CALLCHAIN) {
+       if (evsel__has_callchain(evsel)) {
                const u64 max_callchain_nr = UINT64_MAX / sizeof(u64);
 
                OVERFLOW_CHECK_u64(array);
@@ -2857,7 +2857,7 @@ int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target,
                         "Hint: Try again after reducing the number of events.\n"
                         "Hint: Try increasing the limit with 'ulimit -n <limit>'");
        case ENOMEM:
-               if ((evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN) != 0 &&
+               if (evsel__has_callchain(evsel) &&
                    access("/proc/sys/kernel/perf_event_max_stack", F_OK) == 0)
                        return scnprintf(msg, size,
                                         "Not enough memory to setup event with callchain.\n"

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index b13f5f234c8ffa1dc3dd8870991e99f30b9ccbea..d277930b19a1168ac6f0e76009d92592d2283d80 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -459,6 +459,11 @@ static inline bool perf_evsel__has_branch_callstack(const struct perf_evsel *evs
        return evsel->attr.branch_sample_type & PERF_SAMPLE_BRANCH_CALL_STACK;
 }
 
+static inline bool evsel__has_callchain(const struct perf_evsel *evsel)
+{
+       return (evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN) != 0;
+}
+
 typedef int (*attr__fprintf_f)(FILE *, const char *, const char *, void *);
 
 int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 95333b0681094db12c6196496c4395ba097792c6..34864c87cd3c5f555185f57b6297bebed5b5cd2b 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1757,7 +1757,7 @@ void perf_evsel__output_resort(struct perf_evsel *evsel, struct ui_progress *pro
        bool use_callchain;
 
        if (evsel && symbol_conf.use_callchain && !symbol_conf.show_ref_callgraph)
-               use_callchain = evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN;
+               use_callchain = evsel__has_callchain(evsel);
        else
                use_callchain = symbol_conf.use_callchain;
 

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index b998bb475589ba7760455da7a6f2106db2f91e86..8b93693035610df0d427e158d35402c40851a903 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1094,7 +1094,7 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event,
 
        sample_type = evsel->attr.sample_type;
 
-       if (sample_type & PERF_SAMPLE_CALLCHAIN)
+       if (evsel__has_callchain(evsel))
                callchain__printf(evsel, sample);
 
        if ((sample_type & PERF_SAMPLE_BRANCH_STACK) && !perf_evsel__has_branch_callstack(evsel))