From 6dfbc2c825af6ed4dd131579a599a6d33c766182 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Tue, 22 Jan 2013 18:09:32 +0900
Subject: [PATCH] --- yaml --- r: 350015 b: refs/heads/master c:
 6e1f601a10cbaa5cda869f844292dd81c519a8e7 h: refs/heads/master i:   350013:
 38ecd77afbdac329291b334b423e990b0d388c37   350011:
 d4f7e72af914e4d10772888f9fe73c0ca87d564f   350007:
 2a13d544d8cef1671238f3b423386d6f569ee3a1   349999:
 8452e3067c4081b3a6ee2b79e6384d7e17acca7c   349983:
 d027d1e5d54078fe46ab7d244f127860b7780f8d   349951:
 fdb8f768ba40cd6df3532f503a27b41963626c2e v: v3

---
 [refs]                            |  2 +-
 trunk/tools/perf/builtin-report.c | 13 ++++++++++++-
 trunk/tools/perf/util/symbol.h    |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4c44e6ce3097..2f1b8dfcd5be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8bb559bd4eff5c71601e2e61a4bd1deef44a03c
+refs/heads/master: 6e1f601a10cbaa5cda869f844292dd81c519a8e7
diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c
index 47a864478543..fd2503a5f876 100644
--- a/trunk/tools/perf/builtin-report.c
+++ b/trunk/tools/perf/builtin-report.c
@@ -416,8 +416,16 @@ static int __cmd_report(struct perf_report *rep)
 			hists->symbol_filter_str = rep->symbol_filter_str;
 
 		hists__collapse_resort(hists);
-		hists__output_resort(hists);
 		nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE];
+
+		/* Non-group events are considered as leader */
+		if (symbol_conf.event_group &&
+		    !perf_evsel__is_group_leader(pos)) {
+			struct hists *leader_hists = &pos->leader->hists;
+
+			hists__match(leader_hists, hists);
+			hists__link(leader_hists, hists);
+		}
 	}
 
 	if (nr_samples == 0) {
@@ -425,6 +433,9 @@ static int __cmd_report(struct perf_report *rep)
 		goto out_delete;
 	}
 
+	list_for_each_entry(pos, &session->evlist->entries, node)
+		hists__output_resort(&pos->hists);
+
 	if (use_browser > 0) {
 		if (use_browser == 1) {
 			perf_evlist__tui_browse_hists(session->evlist, help,
diff --git a/trunk/tools/perf/util/symbol.h b/trunk/tools/perf/util/symbol.h
index d97377ac2f16..b62ca37c4b77 100644
--- a/trunk/tools/perf/util/symbol.h
+++ b/trunk/tools/perf/util/symbol.h
@@ -96,7 +96,8 @@ struct symbol_conf {
 			initialized,
 			kptr_restrict,
 			annotate_asm_raw,
-			annotate_src;
+			annotate_src,
+			event_group;
 	const char	*vmlinux_name,
 			*kallsyms_name,
 			*source_prefix,