diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
tree | 8b639000418e2756bf6baece4e00e07d2534bccc /tools/perf/util/scripting-engines/trace-event-perl.c | |
parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-perl.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index 93680818e244..74350ffb57fe 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c | |||
@@ -245,9 +245,11 @@ static inline struct event *find_cache_event(int type) | |||
245 | return event; | 245 | return event; |
246 | } | 246 | } |
247 | 247 | ||
248 | static void perl_process_event(int cpu, void *data, | 248 | static void perl_process_event(union perf_event *pevent __unused, |
249 | int size __unused, | 249 | struct perf_sample *sample, |
250 | unsigned long long nsecs, char *comm) | 250 | struct perf_evsel *evsel, |
251 | struct perf_session *session __unused, | ||
252 | struct thread *thread) | ||
251 | { | 253 | { |
252 | struct format_field *field; | 254 | struct format_field *field; |
253 | static char handler[256]; | 255 | static char handler[256]; |
@@ -256,6 +258,10 @@ static void perl_process_event(int cpu, void *data, | |||
256 | struct event *event; | 258 | struct event *event; |
257 | int type; | 259 | int type; |
258 | int pid; | 260 | int pid; |
261 | int cpu = sample->cpu; | ||
262 | void *data = sample->raw_data; | ||
263 | unsigned long long nsecs = sample->time; | ||
264 | char *comm = thread->comm; | ||
259 | 265 | ||
260 | dSP; | 266 | dSP; |
261 | 267 | ||