aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTom Zanussi <tzanussi@gmail.com>2009-11-30 02:18:48 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-30 03:04:00 -0500
commit61381de0504181368672a83d2e14c38dbaf3c136 (patch)
tree3c3ab8855ea2807b7eb354c79684200291a40ebe /tools
parente136323c5a8a7d91d17c5b7b340758bb9dd33739 (diff)
perf trace/scripting: Fix Perl common_* access functions
The common_* functions (e.g. common_pc(), etc) are exported as common_* but named get_common_*, resulting in unresolved subroutine errors when executing scripts. Make the internal and external names match. Signed-off-by: Tom Zanussi <tzanussi@gmail.com> Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org Cc: anton@samba.org Cc: hch@infradead.org LKML-Reference: <1259565529-6407-4-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/scripts/perl/Perf-Trace-Util/Context.c30
-rw-r--r--tools/perf/scripts/perl/Perf-Trace-Util/Context.xs6
-rw-r--r--tools/perf/util/trace-event-perl.c6
-rw-r--r--tools/perf/util/trace-event-perl.h6
4 files changed, 24 insertions, 24 deletions
diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c
index 3ba3ffc54164..af78d9a52a7d 100644
--- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c
+++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c
@@ -39,8 +39,8 @@
39 39
40#line 41 "Context.c" 40#line 41 "Context.c"
41 41
42XS(XS_Perf__Trace__Context_get_common_pc); /* prototype to pass -Wmissing-prototypes */ 42XS(XS_Perf__Trace__Context_common_pc); /* prototype to pass -Wmissing-prototypes */
43XS(XS_Perf__Trace__Context_get_common_pc) 43XS(XS_Perf__Trace__Context_common_pc)
44{ 44{
45#ifdef dVAR 45#ifdef dVAR
46 dVAR; dXSARGS; 46 dVAR; dXSARGS;
@@ -48,22 +48,22 @@ XS(XS_Perf__Trace__Context_get_common_pc)
48 dXSARGS; 48 dXSARGS;
49#endif 49#endif
50 if (items != 1) 50 if (items != 1)
51 Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::get_common_pc", "context"); 51 Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_pc", "context");
52 PERL_UNUSED_VAR(cv); /* -W */ 52 PERL_UNUSED_VAR(cv); /* -W */
53 { 53 {
54 struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0))); 54 struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
55 int RETVAL; 55 int RETVAL;
56 dXSTARG; 56 dXSTARG;
57 57
58 RETVAL = get_common_pc(context); 58 RETVAL = common_pc(context);
59 XSprePUSH; PUSHi((IV)RETVAL); 59 XSprePUSH; PUSHi((IV)RETVAL);
60 } 60 }
61 XSRETURN(1); 61 XSRETURN(1);
62} 62}
63 63
64 64
65XS(XS_Perf__Trace__Context_get_common_flags); /* prototype to pass -Wmissing-prototypes */ 65XS(XS_Perf__Trace__Context_common_flags); /* prototype to pass -Wmissing-prototypes */
66XS(XS_Perf__Trace__Context_get_common_flags) 66XS(XS_Perf__Trace__Context_common_flags)
67{ 67{
68#ifdef dVAR 68#ifdef dVAR
69 dVAR; dXSARGS; 69 dVAR; dXSARGS;
@@ -71,22 +71,22 @@ XS(XS_Perf__Trace__Context_get_common_flags)
71 dXSARGS; 71 dXSARGS;
72#endif 72#endif
73 if (items != 1) 73 if (items != 1)
74 Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::get_common_flags", "context"); 74 Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_flags", "context");
75 PERL_UNUSED_VAR(cv); /* -W */ 75 PERL_UNUSED_VAR(cv); /* -W */
76 { 76 {
77 struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0))); 77 struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
78 int RETVAL; 78 int RETVAL;
79 dXSTARG; 79 dXSTARG;
80 80
81 RETVAL = get_common_flags(context); 81 RETVAL = common_flags(context);
82 XSprePUSH; PUSHi((IV)RETVAL); 82 XSprePUSH; PUSHi((IV)RETVAL);
83 } 83 }
84 XSRETURN(1); 84 XSRETURN(1);
85} 85}
86 86
87 87
88XS(XS_Perf__Trace__Context_get_common_lock_depth); /* prototype to pass -Wmissing-prototypes */ 88XS(XS_Perf__Trace__Context_common_lock_depth); /* prototype to pass -Wmissing-prototypes */
89XS(XS_Perf__Trace__Context_get_common_lock_depth) 89XS(XS_Perf__Trace__Context_common_lock_depth)
90{ 90{
91#ifdef dVAR 91#ifdef dVAR
92 dVAR; dXSARGS; 92 dVAR; dXSARGS;
@@ -94,14 +94,14 @@ XS(XS_Perf__Trace__Context_get_common_lock_depth)
94 dXSARGS; 94 dXSARGS;
95#endif 95#endif
96 if (items != 1) 96 if (items != 1)
97 Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::get_common_lock_depth", "context"); 97 Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_lock_depth", "context");
98 PERL_UNUSED_VAR(cv); /* -W */ 98 PERL_UNUSED_VAR(cv); /* -W */
99 { 99 {
100 struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0))); 100 struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
101 int RETVAL; 101 int RETVAL;
102 dXSTARG; 102 dXSTARG;
103 103
104 RETVAL = get_common_lock_depth(context); 104 RETVAL = common_lock_depth(context);
105 XSprePUSH; PUSHi((IV)RETVAL); 105 XSprePUSH; PUSHi((IV)RETVAL);
106 } 106 }
107 XSRETURN(1); 107 XSRETURN(1);
@@ -124,9 +124,9 @@ XS(boot_Perf__Trace__Context)
124 PERL_UNUSED_VAR(items); /* -W */ 124 PERL_UNUSED_VAR(items); /* -W */
125 XS_VERSION_BOOTCHECK ; 125 XS_VERSION_BOOTCHECK ;
126 126
127 newXSproto("Perf::Trace::Context::get_common_pc", XS_Perf__Trace__Context_get_common_pc, file, "$"); 127 newXSproto("Perf::Trace::Context::common_pc", XS_Perf__Trace__Context_common_pc, file, "$");
128 newXSproto("Perf::Trace::Context::get_common_flags", XS_Perf__Trace__Context_get_common_flags, file, "$"); 128 newXSproto("Perf::Trace::Context::common_flags", XS_Perf__Trace__Context_common_flags, file, "$");
129 newXSproto("Perf::Trace::Context::get_common_lock_depth", XS_Perf__Trace__Context_get_common_lock_depth, file, "$"); 129 newXSproto("Perf::Trace::Context::common_lock_depth", XS_Perf__Trace__Context_common_lock_depth, file, "$");
130 if (PL_unitcheckav) 130 if (PL_unitcheckav)
131 call_list(PL_scopestack_ix, PL_unitcheckav); 131 call_list(PL_scopestack_ix, PL_unitcheckav);
132 XSRETURN_YES; 132 XSRETURN_YES;
diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs
index 24facb3696d4..fb78006c165e 100644
--- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs
+++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.xs
@@ -28,14 +28,14 @@ MODULE = Perf::Trace::Context PACKAGE = Perf::Trace::Context
28PROTOTYPES: ENABLE 28PROTOTYPES: ENABLE
29 29
30int 30int
31get_common_pc(context) 31common_pc(context)
32 struct scripting_context * context 32 struct scripting_context * context
33 33
34int 34int
35get_common_flags(context) 35common_flags(context)
36 struct scripting_context * context 36 struct scripting_context * context
37 37
38int 38int
39get_common_lock_depth(context) 39common_lock_depth(context)
40 struct scripting_context * context 40 struct scripting_context * context
41 41
diff --git a/tools/perf/util/trace-event-perl.c b/tools/perf/util/trace-event-perl.c
index d179adebc547..2e1cc3c11c70 100644
--- a/tools/perf/util/trace-event-perl.c
+++ b/tools/perf/util/trace-event-perl.c
@@ -242,7 +242,7 @@ static inline struct event *find_cache_event(int type)
242 return event; 242 return event;
243} 243}
244 244
245int get_common_pc(struct scripting_context *context) 245int common_pc(struct scripting_context *context)
246{ 246{
247 int pc; 247 int pc;
248 248
@@ -251,7 +251,7 @@ int get_common_pc(struct scripting_context *context)
251 return pc; 251 return pc;
252} 252}
253 253
254int get_common_flags(struct scripting_context *context) 254int common_flags(struct scripting_context *context)
255{ 255{
256 int flags; 256 int flags;
257 257
@@ -260,7 +260,7 @@ int get_common_flags(struct scripting_context *context)
260 return flags; 260 return flags;
261} 261}
262 262
263int get_common_lock_depth(struct scripting_context *context) 263int common_lock_depth(struct scripting_context *context)
264{ 264{
265 int lock_depth; 265 int lock_depth;
266 266
diff --git a/tools/perf/util/trace-event-perl.h b/tools/perf/util/trace-event-perl.h
index 666a864f5dda..8fe0d866fe1a 100644
--- a/tools/perf/util/trace-event-perl.h
+++ b/tools/perf/util/trace-event-perl.h
@@ -44,8 +44,8 @@ struct scripting_context {
44 void *event_data; 44 void *event_data;
45}; 45};
46 46
47int get_common_pc(struct scripting_context *context); 47int common_pc(struct scripting_context *context);
48int get_common_flags(struct scripting_context *context); 48int common_flags(struct scripting_context *context);
49int get_common_lock_depth(struct scripting_context *context); 49int common_lock_depth(struct scripting_context *context);
50 50
51#endif /* __PERF_TRACE_EVENT_PERL_H */ 51#endif /* __PERF_TRACE_EVENT_PERL_H */