lkml.org 
[lkml]   [2010]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/12] perf trace/scripting: move common code out of Perl-specific files
    Date
    This stuff is needed by all scripting engines; move it from the Perl
    engine source to a more common place.

    Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
    ---
    tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 5 ++-
    tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 3 +-
    tools/perf/util/trace-event-parse.c | 15 +++++++++++
    tools/perf/util/trace-event-perl.c | 27 --------------------
    tools/perf/util/trace-event-perl.h | 8 ------
    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 af78d9a..01a64ad 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 @@
    #include "EXTERN.h"
    #include "perl.h"
    #include "XSUB.h"
    -#include "../../../util/trace-event-perl.h"
    +#include "../../../perf.h"
    +#include "../../../util/trace-event.h"

    #ifndef PERL_UNUSED_VAR
    # define PERL_UNUSED_VAR(var) if (0) var = var
    #endif

    -#line 41 "Context.c"
    +#line 42 "Context.c"

    XS(XS_Perf__Trace__Context_common_pc); /* prototype to pass -Wmissing-prototypes */
    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 fb78006..549cf04 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 @@
    #include "EXTERN.h"
    #include "perl.h"
    #include "XSUB.h"
    -#include "../../../util/trace-event-perl.h"
    +#include "../../../perf.h"
    +#include "../../../util/trace-event.h"

    MODULE = Perf::Trace::Context PACKAGE = Perf::Trace::Context
    PROTOTYPES: ENABLE
    diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
    index c5c32be..c1299ff 100644
    --- a/tools/perf/util/trace-event-parse.c
    +++ b/tools/perf/util/trace-event-parse.c
    @@ -3277,3 +3277,18 @@ void parse_set_info(int nr_cpus, int long_sz)
    cpus = nr_cpus;
    long_size = long_sz;
    }
    +
    +int common_pc(struct scripting_context *context)
    +{
    + return parse_common_pc(context->event_data);
    +}
    +
    +int common_flags(struct scripting_context *context)
    +{
    + return parse_common_flags(context->event_data);
    +}
    +
    +int common_lock_depth(struct scripting_context *context)
    +{
    + return parse_common_lock_depth(context->event_data);
    +}
    diff --git a/tools/perf/util/trace-event-perl.c b/tools/perf/util/trace-event-perl.c
    index 6d6d76b..5b49df0 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)
    return event;
    }

    -int common_pc(struct scripting_context *context)
    -{
    - int pc;
    -
    - pc = parse_common_pc(context->event_data);
    -
    - return pc;
    -}
    -
    -int common_flags(struct scripting_context *context)
    -{
    - int flags;
    -
    - flags = parse_common_flags(context->event_data);
    -
    - return flags;
    -}
    -
    -int common_lock_depth(struct scripting_context *context)
    -{
    - int lock_depth;
    -
    - lock_depth = parse_common_lock_depth(context->event_data);
    -
    - return lock_depth;
    -}
    -
    static void perl_process_event(int cpu, void *data,
    int size __unused,
    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 e88fb26..01efcc9 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);
    typedef PerlInterpreter * INTERP;
    #endif

    -struct scripting_context {
    - void *event_data;
    -};
    -
    -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 */
    diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
    index 6ad4056..aaf2da2 100644
    --- a/tools/perf/util/trace-event.h
    +++ b/tools/perf/util/trace-event.h
    @@ -279,7 +279,14 @@ struct scripting_ops {

    int script_spec_register(const char *spec, struct scripting_ops *ops);

    -extern struct scripting_ops perl_scripting_ops;
    void setup_perl_scripting(void);

    +struct scripting_context {
    + void *event_data;
    +};
    +
    +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_EVENTS_H */
    --
    1.6.4.GIT


    \
     
     \ /
      Last update: 2010-01-27 09:33    [W:0.031 / U:62.608 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site