aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/evsel.h2
-rw-r--r--tools/perf/util/machine.c2
-rw-r--r--tools/perf/util/session.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index b993218744d4..8a644fef452c 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -420,7 +420,7 @@ for ((_evsel) = list_entry((_leader)->node.next, struct perf_evsel, node); \
420 (_evsel) && (_evsel)->leader == (_leader); \ 420 (_evsel) && (_evsel)->leader == (_leader); \
421 (_evsel) = list_entry((_evsel)->node.next, struct perf_evsel, node)) 421 (_evsel) = list_entry((_evsel)->node.next, struct perf_evsel, node))
422 422
423static inline bool has_branch_callstack(struct perf_evsel *evsel) 423static inline bool perf_evsel__has_branch_callstack(const struct perf_evsel *evsel)
424{ 424{
425 return evsel->attr.branch_sample_type & PERF_SAMPLE_BRANCH_CALL_STACK; 425 return evsel->attr.branch_sample_type & PERF_SAMPLE_BRANCH_CALL_STACK;
426} 426}
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 0c4dabc69932..52b51e004fe8 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1808,7 +1808,7 @@ static int thread__resolve_callchain_sample(struct thread *thread,
1808 1808
1809 callchain_cursor_reset(cursor); 1809 callchain_cursor_reset(cursor);
1810 1810
1811 if (has_branch_callstack(evsel)) { 1811 if (perf_evsel__has_branch_callstack(evsel)) {
1812 err = resolve_lbr_callchain_sample(thread, cursor, sample, parent, 1812 err = resolve_lbr_callchain_sample(thread, cursor, sample, parent,
1813 root_al, max_stack); 1813 root_al, max_stack);
1814 if (err) 1814 if (err)
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index ca1827c4af4a..2335b2824d8a 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -907,7 +907,7 @@ static void callchain__printf(struct perf_evsel *evsel,
907 unsigned int i; 907 unsigned int i;
908 struct ip_callchain *callchain = sample->callchain; 908 struct ip_callchain *callchain = sample->callchain;
909 909
910 if (has_branch_callstack(evsel)) 910 if (perf_evsel__has_branch_callstack(evsel))
911 callchain__lbr_callstack_printf(sample); 911 callchain__lbr_callstack_printf(sample);
912 912
913 printf("... FP chain: nr:%" PRIu64 "\n", callchain->nr); 913 printf("... FP chain: nr:%" PRIu64 "\n", callchain->nr);
@@ -1081,7 +1081,7 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event,
1081 if (sample_type & PERF_SAMPLE_CALLCHAIN) 1081 if (sample_type & PERF_SAMPLE_CALLCHAIN)
1082 callchain__printf(evsel, sample); 1082 callchain__printf(evsel, sample);
1083 1083
1084 if ((sample_type & PERF_SAMPLE_BRANCH_STACK) && !has_branch_callstack(evsel)) 1084 if ((sample_type & PERF_SAMPLE_BRANCH_STACK) && !perf_evsel__has_branch_callstack(evsel))
1085 branch_stack__printf(sample); 1085 branch_stack__printf(sample);
1086 1086
1087 if (sample_type & PERF_SAMPLE_REGS_USER) 1087 if (sample_type & PERF_SAMPLE_REGS_USER)