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

Commit 759ff497 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Introduce perf_evsel__is_group_event() helper 



The perf_evsel__is_group_event function is for checking whether given
evsel needs event group view support or not.  Please note that it's
different to the existing perf_evsel__is_group_leader() which checks
only the given evsel is a leader or a standalone (i.e. non-group) event
regardless of event group feature.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1362462812-30885-7-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *self, 
	char buf[512];

	size_t size = sizeof(buf);



	if (symbol_conf.event_group && evsel->nr_members > 1) {

	if (perf_evsel__is_group_event(evsel)) {

		struct perf_evsel *pos;



		perf_evsel__group_desc(evsel, buf, size);

tools/perf/ui/browsers/hists.c

+2 −2
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size, 
	char buf[512];

	size_t buflen = sizeof(buf);



	if (symbol_conf.event_group && evsel->nr_members > 1) {

	if (perf_evsel__is_group_event(evsel)) {

		struct perf_evsel *pos;



		perf_evsel__group_desc(evsel, buf, buflen);
@@ -1709,7 +1709,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser, 
	ui_browser__set_color(browser, current_entry ? HE_COLORSET_SELECTED :

						       HE_COLORSET_NORMAL);



	if (symbol_conf.event_group && evsel->nr_members > 1) {

	if (perf_evsel__is_group_event(evsel)) {

		struct perf_evsel *pos;



		ev_name = perf_evsel__group_name(evsel);

tools/perf/ui/gtk/hists.c

+2 −5
Original line number Diff line number Diff line
@@ -32,21 +32,18 @@ static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he, 
	int ret;

	double percent = 0.0;

	struct hists *hists = he->hists;

	struct perf_evsel *evsel = hists_to_evsel(hists);



	if (hists->stats.total_period)

		percent = 100.0 * get_field(he) / hists->stats.total_period;



	ret = __percent_color_snprintf(hpp->buf, hpp->size, percent);



	if (symbol_conf.event_group) {

	if (perf_evsel__is_group_event(evsel)) {

		int prev_idx, idx_delta;

		struct perf_evsel *evsel = hists_to_evsel(hists);

		struct hist_entry *pair;

		int nr_members = evsel->nr_members;



		if (nr_members <= 1)

			return ret;



		prev_idx = perf_evsel__group_idx(evsel);



		list_for_each_entry(pair, &he->pairs.head, pairs.node) {

tools/perf/ui/hist.c

+2 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
{

	int ret;

	struct hists *hists = he->hists;

	struct perf_evsel *evsel = hists_to_evsel(hists);



	if (fmt_percent) {

		double percent = 0.0;
@@ -28,15 +29,11 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he, 
	} else

		ret = print_fn(hpp->buf, hpp->size, fmt, get_field(he));



	if (symbol_conf.event_group) {

	if (perf_evsel__is_group_event(evsel)) {

		int prev_idx, idx_delta;

		struct perf_evsel *evsel = hists_to_evsel(hists);

		struct hist_entry *pair;

		int nr_members = evsel->nr_members;



		if (nr_members <= 1)

			return ret;



		prev_idx = perf_evsel__group_idx(evsel);



		list_for_each_entry(pair, &he->pairs.head, pairs.node) {

tools/perf/util/annotate.c

+3 −6
Original line number Diff line number Diff line
@@ -649,9 +649,7 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st 


		next = disasm__get_next_ip_line(&notes->src->source, dl);



		if (symbol_conf.event_group &&

		    perf_evsel__is_group_leader(evsel) &&

		    evsel->nr_members > 1) {

		if (perf_evsel__is_group_event(evsel)) {

			nr_percent = evsel->nr_members;

			ppercents = calloc(nr_percent, sizeof(double));

			if (ppercents == NULL)
@@ -721,8 +719,7 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st 
		if (queue)

			return -1;



		if (symbol_conf.event_group &&

		    perf_evsel__is_group_leader(evsel))

		if (perf_evsel__is_group_event(evsel))

			width *= evsel->nr_members;



		if (!*dl->line)
@@ -1126,7 +1123,7 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, 
	len = symbol__size(sym);

	namelen = strlen(d_filename);



	if (symbol_conf.event_group && perf_evsel__is_group_leader(evsel))

	if (perf_evsel__is_group_event(evsel))

		width *= evsel->nr_members;



	printf(" %-*.*s|	Source code & Disassembly of %s\n",