perf evsel: Add missign class prefix to has_branch_stack method

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 23, 2016 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2016-04-23 13:01 UTC #0 lore raw

Commit-ID:  acf2abbd0b7fcc6325e9690a8a32ee924c827f70
Gitweb:     http://git.kernel.org/tip/acf2abbd0b7fcc6325e9690a8a32ee924c827f70
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 18 Apr 2016 10:35:03 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 18 Apr 2016 11:17:09 -0300

perf evsel: Add missign class prefix to has_branch_stack method

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Milian Wolff <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/evsel.h   | 2 +-
 tools/perf/util/machine.c | 2 +-
 tools/perf/util/session.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

tools/perf/util/evsel.h +1 -1

index b993218..8a644fe 100644
@@ -420,7 +420,7 @@ for ((_evsel) = list_entry((_leader)->node.next, struct perf_evsel, node); 	\
      (_evsel) && (_evsel)->leader == (_leader);					\
      (_evsel) = list_entry((_evsel)->node.next, struct perf_evsel, node))
 
-static inline bool has_branch_callstack(struct perf_evsel *evsel)
+static inline bool perf_evsel__has_branch_callstack(const struct perf_evsel *evsel)
 {
 	return evsel->attr.branch_sample_type & PERF_SAMPLE_BRANCH_CALL_STACK;
 }

tools/perf/util/machine.c +1 -1

index 0c4dabc..52b51e0 100644
@@ -1808,7 +1808,7 @@ static int thread__resolve_callchain_sample(struct thread *thread,
 
 	callchain_cursor_reset(cursor);
 
-	if (has_branch_callstack(evsel)) {
+	if (perf_evsel__has_branch_callstack(evsel)) {
 		err = resolve_lbr_callchain_sample(thread, cursor, sample, parent,
 						   root_al, max_stack);
 		if (err)

tools/perf/util/session.c +2 -2

index ca1827c..2335b28 100644
@@ -907,7 +907,7 @@ static void callchain__printf(struct perf_evsel *evsel,
 	unsigned int i;
 	struct ip_callchain *callchain = sample->callchain;
 
-	if (has_branch_callstack(evsel))
+	if (perf_evsel__has_branch_callstack(evsel))
 		callchain__lbr_callstack_printf(sample);
 
 	printf("... FP chain: nr:%" PRIu64 "\n", callchain->nr);

@@ -1081,7 +1081,7 @@ static void dump_sample(struct perf_evsel *evsel, union perf_event *event,
 	if (sample_type & PERF_SAMPLE_CALLCHAIN)
 		callchain__printf(evsel, sample);
 
-	if ((sample_type & PERF_SAMPLE_BRANCH_STACK) && !has_branch_callstack(evsel))
+	if ((sample_type & PERF_SAMPLE_BRANCH_STACK) && !perf_evsel__has_branch_callstack(evsel))
 		branch_stack__printf(sample);
 
 	if (sample_type & PERF_SAMPLE_REGS_USER)