Skip to contentSkip to conversation

perf_counter: Change PERF_SAMPLE_CONFIG into PERF_SAMPLE_ID

tip:perfcounters/core tip-bot for Peter Zijlstra 1 participant 1 message Jun 5, 2009

lore
Share & tools
lore
#0 lore raw
Commit-ID:  ac4bcf889469ffbca88f234d3184452886a47905
Gitweb:     http://git.kernel.org/tip/ac4bcf889469ffbca88f234d3184452886a47905
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Fri, 5 Jun 2009 14:44:52 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Fri, 5 Jun 2009 18:07:47 +0200

perf_counter: Change PERF_SAMPLE_CONFIG into PERF_SAMPLE_ID

The purpose of PERF_SAMPLE_CONFIG was to identify the counters, since then we've added counter ids, use those instead.

Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>

LKML-Reference: <new-submission>

---
 include/linux/perf_counter.h |    2 +-
 kernel/perf_counter.c        |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
include/linux/perf_counter.h +1 -1
index 40dc0e2..9cea32a 100644
@@ -104,7 +104,7 @@ enum perf_counter_sample_format {
 	PERF_SAMPLE_ADDR		= 1U << 3,
 	PERF_SAMPLE_GROUP		= 1U << 4,
 	PERF_SAMPLE_CALLCHAIN		= 1U << 5,
-	PERF_SAMPLE_CONFIG		= 1U << 6,
+	PERF_SAMPLE_ID			= 1U << 6,
 	PERF_SAMPLE_CPU			= 1U << 7,
 };
 
kernel/perf_counter.c +4 -4
index 37a5a24..e75b91a 100644
@@ -2392,8 +2392,8 @@ static void perf_counter_output(struct perf_counter *counter,
 		header.size += sizeof(u64);
 	}
 
-	if (sample_type & PERF_SAMPLE_CONFIG) {
-		header.type |= PERF_SAMPLE_CONFIG;
+	if (sample_type & PERF_SAMPLE_ID) {
+		header.type |= PERF_SAMPLE_ID;
 		header.size += sizeof(u64);
 	}
 
@@ -2439,8 +2439,8 @@ static void perf_counter_output(struct perf_counter *counter,
 	if (sample_type & PERF_SAMPLE_ADDR)
 		perf_output_put(&handle, addr);
 
-	if (sample_type & PERF_SAMPLE_CONFIG)
-		perf_output_put(&handle, counter->attr.config);
+	if (sample_type & PERF_SAMPLE_ID)
+		perf_output_put(&handle, counter->id);
 
 	if (sample_type & PERF_SAMPLE_CPU)
 		perf_output_put(&handle, cpu_entry);