diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-08-07 22:50:21 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-08-07 22:50:21 -0400 |
commit | 9782243353ec135327a80c76c63464e592949cd1 (patch) | |
tree | 74e7269019ba3d7cb63b8fb9bd933fdc41c070d7 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | 7f7f8d0bea5d6bb985f4ae84ca3daff34802fd32 (diff) |
perf script: Stop using pevent directly
We can get all that is needed using just event_format, that is available
via evsel->tp_format now.
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-2hsr1686epa9f0vx4yg7z2zj@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 8006978d8398..df7d33d1de0f 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
@@ -221,7 +221,6 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel) | |||
221 | } | 221 | } |
222 | 222 | ||
223 | static void python_process_event(union perf_event *perf_event __unused, | 223 | static void python_process_event(union perf_event *perf_event __unused, |
224 | struct pevent *pevent, | ||
225 | struct perf_sample *sample, | 224 | struct perf_sample *sample, |
226 | struct perf_evsel *evsel, | 225 | struct perf_evsel *evsel, |
227 | struct machine *machine __unused, | 226 | struct machine *machine __unused, |
@@ -248,7 +247,7 @@ static void python_process_event(union perf_event *perf_event __unused, | |||
248 | if (!event) | 247 | if (!event) |
249 | die("ug! no event found for type %d", (int)evsel->attr.config); | 248 | die("ug! no event found for type %d", (int)evsel->attr.config); |
250 | 249 | ||
251 | pid = trace_parse_common_pid(pevent, data); | 250 | pid = raw_field_value(event, "common_pid", data); |
252 | 251 | ||
253 | sprintf(handler_name, "%s__%s", event->system, event->name); | 252 | sprintf(handler_name, "%s__%s", event->system, event->name); |
254 | 253 | ||
@@ -293,7 +292,7 @@ static void python_process_event(union perf_event *perf_event __unused, | |||
293 | offset = field->offset; | 292 | offset = field->offset; |
294 | obj = PyString_FromString((char *)data + offset); | 293 | obj = PyString_FromString((char *)data + offset); |
295 | } else { /* FIELD_IS_NUMERIC */ | 294 | } else { /* FIELD_IS_NUMERIC */ |
296 | val = read_size(pevent, data + field->offset, | 295 | val = read_size(event, data + field->offset, |
297 | field->size); | 296 | field->size); |
298 | if (field->flags & FIELD_IS_SIGNED) { | 297 | if (field->flags & FIELD_IS_SIGNED) { |
299 | if ((long long)val >= LONG_MIN && | 298 | if ((long long)val >= LONG_MIN && |