From 15ae77d652a14514badd578a5d756dc25a21eb15 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 10 Dec 2012 15:21:30 -0300
Subject: [PATCH] --- yaml --- r: 349902 b: refs/heads/master c:
 7a5a5ca5fe3df8636c96b49591c23baf7c415dd4 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/tools/perf/builtin-top.c      | 6 ++----
 trunk/tools/perf/tests/mmap-basic.c | 3 +--
 trunk/tools/perf/util/evsel.c       | 6 ++++++
 trunk/tools/perf/util/evsel.h       | 2 ++
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ed1f0619ecc3..6c68d7ffdcaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a60d79535c21dca4e24d08abf8ab56e2f860af71
+refs/heads/master: 7a5a5ca5fe3df8636c96b49591c23baf7c415dd4
diff --git a/trunk/tools/perf/builtin-top.c b/trunk/tools/perf/builtin-top.c
index 31a7c51aac76..a30647487ba3 100644
--- a/trunk/tools/perf/builtin-top.c
+++ b/trunk/tools/perf/builtin-top.c
@@ -910,10 +910,8 @@ static void perf_top__start_counters(struct perf_top *top)
 			attr->sample_freq = top->freq;
 		}
 
-		if (evlist->nr_entries > 1) {
-			perf_evsel__set_sample_bit(counter, ID);
-			attr->read_format |= PERF_FORMAT_ID;
-		}
+		if (evlist->nr_entries > 1)
+			perf_evsel__set_sample_id(counter);
 
 		if (perf_target__has_cpu(&top->target))
 			perf_evsel__set_sample_bit(counter, CPU);
diff --git a/trunk/tools/perf/tests/mmap-basic.c b/trunk/tools/perf/tests/mmap-basic.c
index 4743b6d7a09a..cdd50755af51 100644
--- a/trunk/tools/perf/tests/mmap-basic.c
+++ b/trunk/tools/perf/tests/mmap-basic.c
@@ -70,8 +70,7 @@ int test__basic_mmap(void)
 		}
 
 		evsels[i]->attr.wakeup_events = 1;
-		evsels[i]->attr.read_format |= PERF_FORMAT_ID;
-		perf_evsel__set_sample_bit(evsels[i], ID);
+		perf_evsel__set_sample_id(evsels[i]);
 
 		perf_evlist__add(evlist, evsels[i]);
 
diff --git a/trunk/tools/perf/util/evsel.c b/trunk/tools/perf/util/evsel.c
index fc80f5a32fa6..9dde7e933be9 100644
--- a/trunk/tools/perf/util/evsel.c
+++ b/trunk/tools/perf/util/evsel.c
@@ -68,6 +68,12 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel,
 	}
 }
 
+void perf_evsel__set_sample_id(struct perf_evsel *evsel)
+{
+	perf_evsel__set_sample_bit(evsel, ID);
+	evsel->attr.read_format |= PERF_FORMAT_ID;
+}
+
 void perf_evsel__init(struct perf_evsel *evsel,
 		      struct perf_event_attr *attr, int idx)
 {
diff --git a/trunk/tools/perf/util/evsel.h b/trunk/tools/perf/util/evsel.h
index 739853969243..5c089775064f 100644
--- a/trunk/tools/perf/util/evsel.h
+++ b/trunk/tools/perf/util/evsel.h
@@ -129,6 +129,8 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel,
 #define perf_evsel__reset_sample_bit(evsel, bit) \
 	__perf_evsel__reset_sample_bit(evsel, PERF_SAMPLE_##bit)
 
+void perf_evsel__set_sample_id(struct perf_evsel *evsel);
+
 int perf_evsel__set_filter(struct perf_evsel *evsel, int ncpus, int nthreads,
 			   const char *filter);