Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98df858e authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Add flag for non ANY branch mode 



Later patches need to cheaply check that the branch mode is in ANY.  Add
a new function to check all event attrs and add a flag to the report
state, which is then initialized.

v2: Rename flag

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1437233094-12844-3-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0e332f03

tools/perf/builtin-report.c

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct report { 
	bool			mem_mode;

	bool			header;

	bool			header_only;

	bool			nonany_branch_mode;

	int			max_stack;

	struct perf_read_values	show_threads_values;

	const char		*pretty_printing_style;
@@ -258,6 +259,12 @@ static int report__setup_sample_type(struct report *rep) 
		else

			callchain_param.record_mode = CALLCHAIN_FP;

	}



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

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

				PERF_SAMPLE_BRANCH_ANY))

		rep->nonany_branch_mode = true;



	return 0;

}

tools/perf/util/evlist.c

+10 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,16 @@ u64 perf_evlist__combined_sample_type(struct perf_evlist *evlist) 
	return __perf_evlist__combined_sample_type(evlist);

}



u64 perf_evlist__combined_branch_type(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel;

	u64 branch_type = 0;



	evlist__for_each(evlist, evsel)

		branch_type |= evsel->attr.branch_sample_type;

	return branch_type;

}



bool perf_evlist__valid_read_format(struct perf_evlist *evlist)

{

	struct perf_evsel *first = perf_evlist__first(evlist), *pos = first;

tools/perf/util/evlist.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ void perf_evlist__set_leader(struct perf_evlist *evlist); 
u64 perf_evlist__read_format(struct perf_evlist *evlist);

u64 __perf_evlist__combined_sample_type(struct perf_evlist *evlist);

u64 perf_evlist__combined_sample_type(struct perf_evlist *evlist);

u64 perf_evlist__combined_branch_type(struct perf_evlist *evlist);

bool perf_evlist__sample_id_all(struct perf_evlist *evlist);

u16 perf_evlist__id_hdr_size(struct perf_evlist *evlist);