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

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

perf report: Bypass non-leader events when event group is enabled 



Since we have all necessary information in the leader events and other
members don't, bypass members.  Member events will be shown along with
the leaders if event group is enabled.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
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>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1358845787-1350-16-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-report.c

+4 −0
Original line number Diff line number Diff line
@@ -319,6 +319,10 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist, 
		struct hists *hists = &pos->hists;

		const char *evname = perf_evsel__name(pos);



		if (symbol_conf.event_group &&

		    !perf_evsel__is_group_leader(pos))

			continue;



		hists__fprintf_nr_sample_events(hists, evname, stdout);

		hists__fprintf(hists, true, 0, 0, stdout);

		fprintf(stdout, "\n\n");

tools/perf/ui/browsers/hists.c

+35 −6
Original line number Diff line number Diff line
@@ -1695,8 +1695,19 @@ static int perf_evsel_menu__run(struct perf_evsel_menu *menu, 
	return key;

}



static bool filter_group_entries(struct ui_browser *self __maybe_unused,

				 void *entry)

{

	struct perf_evsel *evsel = list_entry(entry, struct perf_evsel, node);



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

		return true;



	return false;

}



static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist,

					   const char *help,

					   int nr_entries, const char *help,

					   struct hist_browser_timer *hbt,

					   struct perf_session_env *env)

{
@@ -1707,7 +1718,8 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist, 
			.refresh    = ui_browser__list_head_refresh,

			.seek	    = ui_browser__list_head_seek,

			.write	    = perf_evsel_menu__write,

			.nr_entries = evlist->nr_entries,

			.filter	    = filter_group_entries,

			.nr_entries = nr_entries,

			.priv	    = evlist,

		},

		.env = env,
@@ -1723,20 +1735,37 @@ static int __perf_evlist__tui_browse_hists(struct perf_evlist *evlist, 
			menu.b.width = line_len;

	}



	return perf_evsel_menu__run(&menu, evlist->nr_entries, help, hbt);

	return perf_evsel_menu__run(&menu, nr_entries, help, hbt);

}



int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,

				  struct hist_browser_timer *hbt,

				  struct perf_session_env *env)

{

	if (evlist->nr_entries == 1) {

	int nr_entries = evlist->nr_entries;



single_entry:

	if (nr_entries == 1) {

		struct perf_evsel *first = list_entry(evlist->entries.next,

						      struct perf_evsel, node);

		const char *ev_name = perf_evsel__name(first);

		return perf_evsel__hists_browse(first, evlist->nr_entries, help,



		return perf_evsel__hists_browse(first, nr_entries, help,

						ev_name, false, hbt, env);

	}



	return __perf_evlist__tui_browse_hists(evlist, help, hbt, env);

	if (symbol_conf.event_group) {

		struct perf_evsel *pos;



		nr_entries = 0;

		list_for_each_entry(pos, &evlist->entries, node)

			if (perf_evsel__is_group_leader(pos))

				nr_entries++;



		if (nr_entries == 1)

			goto single_entry;

	}



	return __perf_evlist__tui_browse_hists(evlist, nr_entries, help,

					       hbt, env);

}

tools/perf/ui/gtk/hists.c

+4 −0
Original line number Diff line number Diff line
@@ -271,6 +271,10 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, 
		GtkWidget *scrolled_window;

		GtkWidget *tab_label;



		if (symbol_conf.event_group &&

		    !perf_evsel__is_group_leader(pos))

			continue;



		scrolled_window = gtk_scrolled_window_new(NULL, NULL);



		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),