Skip to contentSkip to conversation

perf evsel: Handle endianity in intval method

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Sep 28, 2012 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  e6b6f6795265ec19ff35572f527bb74c07ff9399
Gitweb:     http://git.kernel.org/tip/e6b6f6795265ec19ff35572f527bb74c07ff9399
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 26 Sep 2012 13:13:04 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 26 Sep 2012 13:41:47 -0300

perf evsel: Handle endianity in intval method

We were relying on the info in pevent, but since we have it in perf_evsel, set up by the perf_session routine if read from a perf.data file or by whoever creates the evsels, use it.

New 'perf test' entries will use it to parse locally generated events, in a non perf.data centered workflow.

As well as use byteswap.h to get per arch optimized swap routines, like other parts of perf (header, perf_evsel__parse_sample, symbol, etc) already do.

Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
---
 tools/perf/util/evsel.c |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)
tools/perf/util/evsel.c +34 -4
index fe9581b..c78e42a 100644
@@ -1108,13 +1108,43 @@ u64 perf_evsel__intval(struct perf_evsel *evsel, struct perf_sample *sample,
 		       const char *name)
 {
 	struct format_field *field = perf_evsel__field(evsel, name);
-	u64 val;
+	void *ptr;
+	u64 value;
 
 	if (!field)
 		return 0;
 
-	val = pevent_read_number(evsel->tp_format->pevent,
-				 sample->raw_data + field->offset, field->size);
-	return val;
+	ptr = sample->raw_data + field->offset;
 
+	switch (field->size) {
+	case 1:
+		return *(u8 *)ptr;
+	case 2:
+		value = *(u16 *)ptr;
+		break;
+	case 4:
+		value = *(u32 *)ptr;
+		break;
+	case 8:
+		value = *(u64 *)ptr;
+		break;
+	default:
+		return 0;
+	}
+
+	if (!evsel->needs_swap)
+		return value;
+
+	switch (field->size) {
+	case 2:
+		return bswap_16(value);
+	case 4:
+		return bswap_32(value);
+	case 8:
+		return bswap_64(value);
+	default:
+		return 0;
+	}
+
+	return 0;
 }