diff options
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index c6d99334bdf..6ccf70e8d8f 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
@@ -204,9 +204,11 @@ static inline struct event *find_cache_event(int type) | |||
204 | return event; | 204 | return event; |
205 | } | 205 | } |
206 | 206 | ||
207 | static void python_process_event(int cpu, void *data, | 207 | static void python_process_event(union perf_event *pevent __unused, |
208 | int size __unused, | 208 | struct perf_sample *sample, |
209 | unsigned long long nsecs, char *comm) | 209 | struct perf_evsel *evsel __unused, |
210 | struct perf_session *session __unused, | ||
211 | struct thread *thread) | ||
210 | { | 212 | { |
211 | PyObject *handler, *retval, *context, *t, *obj, *dict = NULL; | 213 | PyObject *handler, *retval, *context, *t, *obj, *dict = NULL; |
212 | static char handler_name[256]; | 214 | static char handler_name[256]; |
@@ -217,6 +219,10 @@ static void python_process_event(int cpu, void *data, | |||
217 | unsigned n = 0; | 219 | unsigned n = 0; |
218 | int type; | 220 | int type; |
219 | int pid; | 221 | int pid; |
222 | int cpu = sample->cpu; | ||
223 | void *data = sample->raw_data; | ||
224 | unsigned long long nsecs = sample->time; | ||
225 | char *comm = thread->comm; | ||
220 | 226 | ||
221 | t = PyTuple_New(MAX_FIELDS); | 227 | t = PyTuple_New(MAX_FIELDS); |
222 | if (!t) | 228 | if (!t) |
@@ -248,8 +254,7 @@ static void python_process_event(int cpu, void *data, | |||
248 | context = PyCObject_FromVoidPtr(scripting_context, NULL); | 254 | context = PyCObject_FromVoidPtr(scripting_context, NULL); |
249 | 255 | ||
250 | PyTuple_SetItem(t, n++, PyString_FromString(handler_name)); | 256 | PyTuple_SetItem(t, n++, PyString_FromString(handler_name)); |
251 | PyTuple_SetItem(t, n++, | 257 | PyTuple_SetItem(t, n++, context); |
252 | PyCObject_FromVoidPtr(scripting_context, NULL)); | ||
253 | 258 | ||
254 | if (handler) { | 259 | if (handler) { |
255 | PyTuple_SetItem(t, n++, PyInt_FromLong(cpu)); | 260 | PyTuple_SetItem(t, n++, PyInt_FromLong(cpu)); |