Commit 92c7d7cd authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evlist: Fix the class prefix for 'struct evlist' branch_type methods 



To differentiate from libperf's 'struct perf_evlist' methods.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8cedf3a5

tools/perf/builtin-report.c

+1 −2
Original line number Diff line number Diff line
@@ -410,8 +410,7 @@ static int report__setup_sample_type(struct report *rep) 
	}



	/* ??? handle more cases than just ANY? */

	if (!(perf_evlist__combined_branch_type(session->evlist) &

				PERF_SAMPLE_BRANCH_ANY))

	if (!(evlist__combined_branch_type(session->evlist) & PERF_SAMPLE_BRANCH_ANY))

		rep->nonany_branch_mode = true;



#if !defined(HAVE_LIBUNWIND_SUPPORT) && !defined(HAVE_DWARF_SUPPORT)

tools/perf/builtin-script.c

+1 −2
Original line number Diff line number Diff line
@@ -443,8 +443,7 @@ static int evsel__check_attr(struct evsel *evsel, struct perf_session *session) 
		return -EINVAL;

	}

	if (PRINT_FIELD(BRSTACKINSN) && !allow_user_set &&

	    !(perf_evlist__combined_branch_type(session->evlist) &

	      PERF_SAMPLE_BRANCH_ANY)) {

	    !(evlist__combined_branch_type(session->evlist) & PERF_SAMPLE_BRANCH_ANY)) {

		pr_err("Display of branch stack assembler requested, but non all-branch filter set\n"

		       "Hint: run 'perf record -b ...'\n");

		return -EINVAL;

tools/perf/util/evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ u64 evlist__combined_sample_type(struct evlist *evlist) 
	return __evlist__combined_sample_type(evlist);

}



u64 perf_evlist__combined_branch_type(struct evlist *evlist)

u64 evlist__combined_branch_type(struct evlist *evlist)

{

	struct evsel *evsel;

	u64 branch_type = 0;

tools/perf/util/evlist.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ void perf_evlist__set_leader(struct evlist *evlist); 


u64 __evlist__combined_sample_type(struct evlist *evlist);

u64 evlist__combined_sample_type(struct evlist *evlist);

u64 perf_evlist__combined_branch_type(struct evlist *evlist);

u64 evlist__combined_branch_type(struct evlist *evlist);

bool evlist__sample_id_all(struct evlist *evlist);

u16 perf_evlist__id_hdr_size(struct evlist *evlist);

CRA Git | Maintained and supported by SUSTech CRA and CCSE