Messages in this thread Patch in this message | | | From | Namhyung Kim <> | Subject | [PATCH 11/12] perf report: Show group description when event group is enabled | Date | Tue, 24 Jul 2012 18:01:32 +0900 |
| |
From: Namhyung Kim <namhyung.kim@lge.com>
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 children, it's a non-group event.
Cc: Stephane Eranian <eranian@google.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Pekka Enberg <penberg@kernel.org> Signed-off-by: Namhyung Kim <namhyung@kernel.org> --- tools/perf/builtin-report.c | 18 ++++++++++++++++++ tools/perf/ui/browsers/hists.c | 31 +++++++++++++++++++++++++++++++ tools/perf/ui/gtk/browser.c | 14 +++++++++++--- tools/perf/util/evsel.c | 25 +++++++++++++++++++++++++ tools/perf/util/evsel.h | 2 ++ 5 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 6f34a2d6e5a8..d7dfa2863ece 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -298,6 +298,24 @@ 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_2_evsel(self); + char buf[512]; + size_t size = sizeof(buf); + + if (symbol_conf.report_group && evsel->nr_children) { + int i; + struct events_stats *stats; + + perf_evsel__group_desc(evsel, buf, size); + evname = buf; + + for (i = 0; i < evsel->nr_children; i++) { + stats = &self->group_stats[i]; + + nr_samples += stats->nr_events[PERF_RECORD_SAMPLE]; + nr_events += stats->total_period; + } + } nr_samples = convert_unit(nr_samples, &unit); ret = fprintf(fp, "# Samples: %lu%c", nr_samples, unit); diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index dbd6995609bf..031d6eba83d9 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1114,6 +1114,24 @@ 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_2_evsel(hists); + char buf[512]; + size_t buflen = sizeof(buf); + + if (symbol_conf.report_group && evsel->nr_children) { + int i; + struct events_stats *stats; + + perf_evsel__group_desc(evsel, buf, buflen); + ev_name = buf; + + for (i = 0; i < evsel->nr_children; i++) { + stats = &hists->group_stats[i]; + + nr_samples += stats->nr_events[PERF_RECORD_SAMPLE]; + nr_events += stats->total_period; + } + } nr_samples = convert_unit(nr_samples, &unit); printed = scnprintf(bf, size, @@ -1458,6 +1476,19 @@ 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.report_group && evsel->nr_children) { + int i; + struct events_stats *stats; + + ev_name = perf_evsel__group_name(evsel); + + for (i = 0; i < evsel->nr_children; i++) { + stats = &evsel->hists.group_stats[i]; + + nr_events += 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); diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c index cc53a01ba14b..fddedb504d47 100644 --- a/tools/perf/ui/gtk/browser.c +++ b/tools/perf/ui/gtk/browser.c @@ -305,10 +305,18 @@ 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.report_group && - !perf_evsel__is_group_leader(pos)) - continue; + if (symbol_conf.report_group) { + if (!perf_evsel__is_group_leader(pos)) + continue; + + if (pos->nr_children) { + perf_evsel__group_desc(pos, buf, size); + evname = buf; + } + } scrolled_window = gtk_scrolled_window_new(NULL, NULL); diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index fcb357c35649..f6ab9a1c2a46 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -324,6 +324,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; +} + void perf_evsel__config(struct perf_evsel *evsel, struct perf_record_opts *opts, struct perf_evsel *first) { diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index efc9e5c42210..eeb2c38a1df7 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -119,6 +119,8 @@ const char *perf_evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_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); -- 1.7.10.4
| |