perf evsel: Handle endianity in intval method
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 26 Sep 2012 16:13:04 +0000 (13:13 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 26 Sep 2012 16:41:47 +0000 (13:41 -0300)
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 <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-8tjuxk09mlsfmh7macgkxsip@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/evsel.c

index fe9581b0323c034dcffb2453e91898e04027b2c2..c78e42ab97703d42dbae609871e61b9a7f0dbbe0 100644 (file)
@@ -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;
 }