Skip to content

Commit

Permalink
perf trace/scripting: Fix Perl common_* access functions
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Tom Zanussi authored and Ingo Molnar committed Nov 30, 2009
1 parent e136323 commit 61381de
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
30 changes: 15 additions & 15 deletions tools/perf/scripts/perl/Perf-Trace-Util/Context.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,69 +39,69 @@

#line 41 "Context.c"

XS(XS_Perf__Trace__Context_get_common_pc); /* prototype to pass -Wmissing-prototypes */
XS(XS_Perf__Trace__Context_get_common_pc)
XS(XS_Perf__Trace__Context_common_pc); /* prototype to pass -Wmissing-prototypes */
XS(XS_Perf__Trace__Context_common_pc)
{
#ifdef dVAR
dVAR; dXSARGS;
#else
dXSARGS;
#endif
if (items != 1)
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::get_common_pc", "context");
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_pc", "context");
PERL_UNUSED_VAR(cv); /* -W */
{
struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
int RETVAL;
dXSTARG;

RETVAL = get_common_pc(context);
RETVAL = common_pc(context);
XSprePUSH; PUSHi((IV)RETVAL);
}
XSRETURN(1);
}


XS(XS_Perf__Trace__Context_get_common_flags); /* prototype to pass -Wmissing-prototypes */
XS(XS_Perf__Trace__Context_get_common_flags)
XS(XS_Perf__Trace__Context_common_flags); /* prototype to pass -Wmissing-prototypes */
XS(XS_Perf__Trace__Context_common_flags)
{
#ifdef dVAR
dVAR; dXSARGS;
#else
dXSARGS;
#endif
if (items != 1)
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::get_common_flags", "context");
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_flags", "context");
PERL_UNUSED_VAR(cv); /* -W */
{
struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
int RETVAL;
dXSTARG;

RETVAL = get_common_flags(context);
RETVAL = common_flags(context);
XSprePUSH; PUSHi((IV)RETVAL);
}
XSRETURN(1);
}


XS(XS_Perf__Trace__Context_get_common_lock_depth); /* prototype to pass -Wmissing-prototypes */
XS(XS_Perf__Trace__Context_get_common_lock_depth)
XS(XS_Perf__Trace__Context_common_lock_depth); /* prototype to pass -Wmissing-prototypes */
XS(XS_Perf__Trace__Context_common_lock_depth)
{
#ifdef dVAR
dVAR; dXSARGS;
#else
dXSARGS;
#endif
if (items != 1)
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::get_common_lock_depth", "context");
Perl_croak(aTHX_ "Usage: %s(%s)", "Perf::Trace::Context::common_lock_depth", "context");
PERL_UNUSED_VAR(cv); /* -W */
{
struct scripting_context * context = INT2PTR(struct scripting_context *,SvIV(ST(0)));
int RETVAL;
dXSTARG;

RETVAL = get_common_lock_depth(context);
RETVAL = common_lock_depth(context);
XSprePUSH; PUSHi((IV)RETVAL);
}
XSRETURN(1);
Expand All @@ -124,9 +124,9 @@ XS(boot_Perf__Trace__Context)
PERL_UNUSED_VAR(items); /* -W */
XS_VERSION_BOOTCHECK ;

newXSproto("Perf::Trace::Context::get_common_pc", XS_Perf__Trace__Context_get_common_pc, file, "$");
newXSproto("Perf::Trace::Context::get_common_flags", XS_Perf__Trace__Context_get_common_flags, file, "$");
newXSproto("Perf::Trace::Context::get_common_lock_depth", XS_Perf__Trace__Context_get_common_lock_depth, file, "$");
newXSproto("Perf::Trace::Context::common_pc", XS_Perf__Trace__Context_common_pc, file, "$");
newXSproto("Perf::Trace::Context::common_flags", XS_Perf__Trace__Context_common_flags, file, "$");
newXSproto("Perf::Trace::Context::common_lock_depth", XS_Perf__Trace__Context_common_lock_depth, file, "$");
if (PL_unitcheckav)
call_list(PL_scopestack_ix, PL_unitcheckav);
XSRETURN_YES;
Expand Down
6 changes: 3 additions & 3 deletions tools/perf/scripts/perl/Perf-Trace-Util/Context.xs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ MODULE = Perf::Trace::Context PACKAGE = Perf::Trace::Context
PROTOTYPES: ENABLE

int
get_common_pc(context)
common_pc(context)
struct scripting_context * context

int
get_common_flags(context)
common_flags(context)
struct scripting_context * context

int
get_common_lock_depth(context)
common_lock_depth(context)
struct scripting_context * context

6 changes: 3 additions & 3 deletions tools/perf/util/trace-event-perl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static inline struct event *find_cache_event(int type)
return event;
}

int get_common_pc(struct scripting_context *context)
int common_pc(struct scripting_context *context)
{
int pc;

Expand All @@ -251,7 +251,7 @@ int get_common_pc(struct scripting_context *context)
return pc;
}

int get_common_flags(struct scripting_context *context)
int common_flags(struct scripting_context *context)
{
int flags;

Expand All @@ -260,7 +260,7 @@ int get_common_flags(struct scripting_context *context)
return flags;
}

int get_common_lock_depth(struct scripting_context *context)
int common_lock_depth(struct scripting_context *context)
{
int lock_depth;

Expand Down
6 changes: 3 additions & 3 deletions tools/perf/util/trace-event-perl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ struct scripting_context {
void *event_data;
};

int get_common_pc(struct scripting_context *context);
int get_common_flags(struct scripting_context *context);
int get_common_lock_depth(struct scripting_context *context);
int common_pc(struct scripting_context *context);
int common_flags(struct scripting_context *context);
int common_lock_depth(struct scripting_context *context);

#endif /* __PERF_TRACE_EVENT_PERL_H */

0 comments on commit 61381de

Please sign in to comment.