diff options
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 5 | ||||
-rw-r--r-- | tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 3 | ||||
-rw-r--r-- | tools/perf/util/trace-event-parse.c | 15 | ||||
-rw-r--r-- | tools/perf/util/trace-event-perl.c | 27 | ||||
-rw-r--r-- | tools/perf/util/trace-event-perl.h | 8 | ||||
-rw-r--r-- | tools/perf/util/trace-event.h | 9 |
6 files changed, 28 insertions, 39 deletions
diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c index af78d9a52a7d..01a64ad693f2 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c | |||
@@ -31,13 +31,14 @@ | |||
31 | #include "EXTERN.h" | 31 | #include "EXTERN.h" |
32 | #include "perl.h" | 32 | #include "perl.h" |
33 | #include "XSUB.h" | 33 | #include "XSUB.h" |
34 | #include "../../../util/trace-event-perl.h" | 34 | #include "../../../perf.h" |
35 | #include "../../../util/trace-event.h" | ||
35 | 36 | ||
36 | #ifndef PERL_UNUSED_VAR | 37 | #ifndef PERL_UNUSED_VAR |
37 | # define PERL_UNUSED_VAR(var) if (0) var = var | 38 | # define PERL_UNUSED_VAR(var) if (0) var = var |
38 | #endif | 39 | #endif |
39 | 40 | ||
40 | #line 41 "Context.c" | 41 | #line 42 "Context.c" |
41 | 42 | ||
42 | XS(XS_Perf__Trace__Context_common_pc); /* prototype to pass -Wmissing-prototypes */ | 43 | XS(XS_Perf__Trace__Context_common_pc); /* prototype to pass -Wmissing-prototypes */ |
43 | XS(XS_Perf__Trace__Context_common_pc) | 44 | XS(XS_Perf__Trace__Context_common_pc) |
diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs index fb78006c165e..549cf0467d30 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | |||
@@ -22,7 +22,8 @@ | |||
22 | #include "EXTERN.h" | 22 | #include "EXTERN.h" |
23 | #include "perl.h" | 23 | #include "perl.h" |
24 | #include "XSUB.h" | 24 | #include "XSUB.h" |
25 | #include "../../../util/trace-event-perl.h" | 25 | #include "../../../perf.h" |
26 | #include "../../../util/trace-event.h" | ||
26 | 27 | ||
27 | MODULE = Perf::Trace::Context PACKAGE = Perf::Trace::Context | 28 | MODULE = Perf::Trace::Context PACKAGE = Perf::Trace::Context |
28 | PROTOTYPES: ENABLE | 29 | PROTOTYPES: ENABLE |
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index c4b3cb8a02b1..9b3c20f42f98 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c | |||
@@ -3286,3 +3286,18 @@ void parse_set_info(int nr_cpus, int long_sz) | |||
3286 | cpus = nr_cpus; | 3286 | cpus = nr_cpus; |
3287 | long_size = long_sz; | 3287 | long_size = long_sz; |
3288 | } | 3288 | } |
3289 | |||
3290 | int common_pc(struct scripting_context *context) | ||
3291 | { | ||
3292 | return parse_common_pc(context->event_data); | ||
3293 | } | ||
3294 | |||
3295 | int common_flags(struct scripting_context *context) | ||
3296 | { | ||
3297 | return parse_common_flags(context->event_data); | ||
3298 | } | ||
3299 | |||
3300 | int common_lock_depth(struct scripting_context *context) | ||
3301 | { | ||
3302 | return parse_common_lock_depth(context->event_data); | ||
3303 | } | ||
diff --git a/tools/perf/util/trace-event-perl.c b/tools/perf/util/trace-event-perl.c index 6d6d76b8a21e..5b49df067df0 100644 --- a/tools/perf/util/trace-event-perl.c +++ b/tools/perf/util/trace-event-perl.c | |||
@@ -239,33 +239,6 @@ static inline struct event *find_cache_event(int type) | |||
239 | return event; | 239 | return event; |
240 | } | 240 | } |
241 | 241 | ||
242 | int common_pc(struct scripting_context *context) | ||
243 | { | ||
244 | int pc; | ||
245 | |||
246 | pc = parse_common_pc(context->event_data); | ||
247 | |||
248 | return pc; | ||
249 | } | ||
250 | |||
251 | int common_flags(struct scripting_context *context) | ||
252 | { | ||
253 | int flags; | ||
254 | |||
255 | flags = parse_common_flags(context->event_data); | ||
256 | |||
257 | return flags; | ||
258 | } | ||
259 | |||
260 | int common_lock_depth(struct scripting_context *context) | ||
261 | { | ||
262 | int lock_depth; | ||
263 | |||
264 | lock_depth = parse_common_lock_depth(context->event_data); | ||
265 | |||
266 | return lock_depth; | ||
267 | } | ||
268 | |||
269 | static void perl_process_event(int cpu, void *data, | 242 | static void perl_process_event(int cpu, void *data, |
270 | int size __unused, | 243 | int size __unused, |
271 | unsigned long long nsecs, char *comm) | 244 | unsigned long long nsecs, char *comm) |
diff --git a/tools/perf/util/trace-event-perl.h b/tools/perf/util/trace-event-perl.h index e88fb26137bb..01efcc9564fb 100644 --- a/tools/perf/util/trace-event-perl.h +++ b/tools/perf/util/trace-event-perl.h | |||
@@ -44,12 +44,4 @@ void boot_DynaLoader(pTHX_ CV *cv); | |||
44 | typedef PerlInterpreter * INTERP; | 44 | typedef PerlInterpreter * INTERP; |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | struct scripting_context { | ||
48 | void *event_data; | ||
49 | }; | ||
50 | |||
51 | int common_pc(struct scripting_context *context); | ||
52 | int common_flags(struct scripting_context *context); | ||
53 | int common_lock_depth(struct scripting_context *context); | ||
54 | |||
55 | #endif /* __PERF_TRACE_EVENT_PERL_H */ | 47 | #endif /* __PERF_TRACE_EVENT_PERL_H */ |
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index 6ad405620c9b..aaf2da2d21e5 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h | |||
@@ -279,7 +279,14 @@ struct scripting_ops { | |||
279 | 279 | ||
280 | int script_spec_register(const char *spec, struct scripting_ops *ops); | 280 | int script_spec_register(const char *spec, struct scripting_ops *ops); |
281 | 281 | ||
282 | extern struct scripting_ops perl_scripting_ops; | ||
283 | void setup_perl_scripting(void); | 282 | void setup_perl_scripting(void); |
284 | 283 | ||
284 | struct scripting_context { | ||
285 | void *event_data; | ||
286 | }; | ||
287 | |||
288 | int common_pc(struct scripting_context *context); | ||
289 | int common_flags(struct scripting_context *context); | ||
290 | int common_lock_depth(struct scripting_context *context); | ||
291 | |||
285 | #endif /* __PERF_TRACE_EVENTS_H */ | 292 | #endif /* __PERF_TRACE_EVENTS_H */ |