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

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

perf report: Show group description when event group is enabled 



When using event group viewer, it's better to show the group description
rather than the leader information alone.

If a leader did not contain any member, it's a non-group event.

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-17-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-report.c

+15 −0
Original line number Diff line number Diff line
@@ -299,6 +299,21 @@ static size_t hists__fprintf_nr_sample_events(struct hists *self, 
	char unit;

	unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE];

	u64 nr_events = self->stats.total_period;

	struct perf_evsel *evsel = hists_to_evsel(self);

	char buf[512];

	size_t size = sizeof(buf);



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

		struct perf_evsel *pos;



		perf_evsel__group_desc(evsel, buf, size);

		evname = buf;



		for_each_group_member(pos, evsel) {

			nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE];

			nr_events += pos->hists.stats.total_period;

		}

	}



	nr_samples = convert_unit(nr_samples, &unit);

	ret = fprintf(fp, "# Samples: %lu%c", nr_samples, unit);

tools/perf/ui/browsers/hists.c

+25 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,21 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size, 
	const struct thread *thread = hists->thread_filter;

	unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];

	u64 nr_events = hists->stats.total_period;

	struct perf_evsel *evsel = hists_to_evsel(hists);

	char buf[512];

	size_t buflen = sizeof(buf);



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

		struct perf_evsel *pos;



		perf_evsel__group_desc(evsel, buf, buflen);

		ev_name = buf;



		for_each_group_member(pos, evsel) {

			nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE];

			nr_events += pos->hists.stats.total_period;

		}

	}



	nr_samples = convert_unit(nr_samples, &unit);

	printed = scnprintf(bf, size,
@@ -1585,6 +1600,16 @@ 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) {

		struct perf_evsel *pos;



		ev_name = perf_evsel__group_name(evsel);



		for_each_group_member(pos, evsel) {

			nr_events += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE];

		}

	}



	nr_events = convert_unit(nr_events, &unit);

	printed = scnprintf(bf, sizeof(bf), "%lu%c%s%s", nr_events,

			   unit, unit == ' ' ? "" : " ", ev_name);

tools/perf/ui/gtk/hists.c

+11 −3
Original line number Diff line number Diff line
@@ -270,11 +270,19 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, 
		const char *evname = perf_evsel__name(pos);

		GtkWidget *scrolled_window;

		GtkWidget *tab_label;

		char buf[512];

		size_t size = sizeof(buf);



		if (symbol_conf.event_group &&

		    !perf_evsel__is_group_leader(pos))

		if (symbol_conf.event_group) {

			if (!perf_evsel__is_group_leader(pos))

				continue;



			if (pos->nr_members > 1) {

				perf_evsel__group_desc(pos, buf, size);

				evname = buf;

			}

		}



		scrolled_window = gtk_scrolled_window_new(NULL, NULL);



		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),

tools/perf/util/evsel.c

+25 −0
Original line number Diff line number Diff line
@@ -434,6 +434,31 @@ const char *perf_evsel__name(struct perf_evsel *evsel) 
	return evsel->name ?: "unknown";

}



const char *perf_evsel__group_name(struct perf_evsel *evsel)

{

	return evsel->group_name ?: "anon group";

}



int perf_evsel__group_desc(struct perf_evsel *evsel, char *buf, size_t size)

{

	int ret;

	struct perf_evsel *pos;

	const char *group_name = perf_evsel__group_name(evsel);



	ret = scnprintf(buf, size, "%s", group_name);



	ret += scnprintf(buf + ret, size - ret, " { %s",

			 perf_evsel__name(evsel));



	for_each_group_member(pos, evsel)

		ret += scnprintf(buf + ret, size - ret, ", %s",

				 perf_evsel__name(pos));



	ret += scnprintf(buf + ret, size - ret, " }");



	return ret;

}



/*

 * The enable_on_exec/disabled value strategy:

 *

tools/perf/util/evsel.h

+8 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ extern const char *perf_evsel__sw_names[PERF_COUNT_SW_MAX]; 
int __perf_evsel__hw_cache_type_op_res_name(u8 type, u8 op, u8 result,

					    char *bf, size_t size);

const char *perf_evsel__name(struct perf_evsel *evsel);

const char *perf_evsel__group_name(struct perf_evsel *evsel);

int perf_evsel__group_desc(struct perf_evsel *evsel, char *buf, size_t size);



int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);

int perf_evsel__alloc_id(struct perf_evsel *evsel, int ncpus, int nthreads);
@@ -267,4 +269,10 @@ static inline int perf_evsel__group_idx(struct perf_evsel *evsel) 
{

	return evsel->idx - evsel->leader->idx;

}



#define for_each_group_member(_evsel, _leader) 					\

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))



#endif /* __PERF_EVSEL_H */