From 3c90975e28fbe387933703b45a1144505bb1527b Mon Sep 17 00:00:00 2001
From: Eric B Munson <ebmunson@us.ibm.com>
Date: Fri, 5 Mar 2010 12:51:07 -0300
Subject: [PATCH] --- yaml --- r: 188263 b: refs/heads/master c:
 cb8f09393646c5058056db771583c86e0ed1d92f h: refs/heads/master i:   188261:
 2f0d99667c0317cc7c9bbbe0f985f0625860f8b1   188259:
 6b5c01b8fb8ec2bbd3db40d6274ecb33c639a011   188255:
 d529b45c463199ee6b954bb6401af6d6b6cc620a v: v3

---
 [refs]                          | 2 +-
 trunk/tools/perf/util/event.h   | 9 +++++++++
 trunk/tools/perf/util/session.c | 1 +
 trunk/tools/perf/util/session.h | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b699668ab31..447688ae2b27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d403d0acc9c5afa679a3f61e71489530d7fa0606
+refs/heads/master: cb8f09393646c5058056db771583c86e0ed1d92f
diff --git a/trunk/tools/perf/util/event.h b/trunk/tools/perf/util/event.h
index 50a7132887f5..a33b94952e34 100644
--- a/trunk/tools/perf/util/event.h
+++ b/trunk/tools/perf/util/event.h
@@ -99,6 +99,15 @@ struct events_stats {
 	u64 lost;
 };
 
+struct event_stat_id {
+	struct rb_node		rb_node;
+	struct rb_root		hists;
+	struct events_stats	stats;
+	u64			config;
+	u64			event_stream;
+	u32			type;
+};
+
 void event__print_totals(void);
 
 struct perf_session;
diff --git a/trunk/tools/perf/util/session.c b/trunk/tools/perf/util/session.c
index 0de7258e70a5..eed1cb889008 100644
--- a/trunk/tools/perf/util/session.c
+++ b/trunk/tools/perf/util/session.c
@@ -70,6 +70,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool forc
 
 	memcpy(self->filename, filename, len);
 	self->threads = RB_ROOT;
+	self->stats_by_id = RB_ROOT;
 	self->last_match = NULL;
 	self->mmap_window = 32;
 	self->cwd = NULL;
diff --git a/trunk/tools/perf/util/session.h b/trunk/tools/perf/util/session.h
index 31950fcd8a4d..5c33417eebb3 100644
--- a/trunk/tools/perf/util/session.h
+++ b/trunk/tools/perf/util/session.h
@@ -20,6 +20,7 @@ struct perf_session {
 	struct thread		*last_match;
 	struct map		*vmlinux_maps[MAP__NR_TYPES];
 	struct events_stats	events_stats;
+	struct rb_root		stats_by_id;
 	unsigned long		event_total[PERF_RECORD_MAX];
 	unsigned long		unknown_events;
 	struct rb_root		hists;