perf script: Change process_event prototype

Prepare for handling of samples for any event type.

Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <1299734608-5223-2-git-send-email-daahern@cisco.com>
Signed-off-by: David Ahern <daahern@cisco.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 5f40df635dcb0dbaddd6e65aa7f6b9678120b6d8..b2bdd55340264e92b83844498530025daac4c2ee 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -20,6 +20,20 @@ static u64                   last_timestamp;
 static u64                     nr_unordered;
 extern const struct option     record_options[];
 
+static void process_event(union perf_event *event __unused,
+                         struct perf_sample *sample,
+                         struct perf_session *session __unused,
+                         struct thread *thread)
+{
+       /*
+        * FIXME: better resolve from pid from the struct trace_entry
+        * field, although it should be the same than this perf
+        * event pid
+        */
+       print_event(sample->cpu, sample->raw_data, sample->raw_size,
+                   sample->time, thread->comm);
+}
+
 static int default_start_script(const char *script __unused,
                                int argc __unused,
                                const char **argv __unused)
@@ -40,7 +54,7 @@ static int default_generate_script(const char *outfile __unused)
 static struct scripting_ops default_scripting_ops = {
        .start_script           = default_start_script,
        .stop_script            = default_stop_script,
-       .process_event          = print_event,
+       .process_event          = process_event,
        .generate_script        = default_generate_script,
 };
 
@@ -86,14 +100,7 @@ static int process_sample_event(union perf_event *event,
                        last_timestamp = sample->time;
                        return 0;
                }
-               /*
-                * FIXME: better resolve from pid from the struct trace_entry
-                * field, although it should be the same than this perf
-                * event pid
-                */
-               scripting_ops->process_event(sample->cpu, sample->raw_data,
-                                            sample->raw_size,
-                                            sample->time, thread->comm);
+               scripting_ops->process_event(event, sample, session, thread);
        }
 
        session->hists.stats.total_period += sample->period;

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 93680818e244ca8a2e58f49e59af0ca729eeb50e..621427212e86f09a8736acc3af89545567b4a319 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -245,9 +245,10 @@ static inline struct event *find_cache_event(int type)
        return event;
 }
 
-static void perl_process_event(int cpu, void *data,
-                              int size __unused,
-                              unsigned long long nsecs, char *comm)
+static void perl_process_event(union perf_event *pevent __unused,
+                              struct perf_sample *sample,
+                              struct perf_session *session __unused,
+                              struct thread *thread)
 {
        struct format_field *field;
        static char handler[256];
@@ -256,6 +257,10 @@ static void perl_process_event(int cpu, void *data,
        struct event *event;
        int type;
        int pid;
+       int cpu = sample->cpu;
+       void *data = sample->raw_data;
+       unsigned long long nsecs = sample->time;
+       char *comm = thread->comm;
 
        dSP;
 

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 2040b8538527361828ad7a4ad3e034b9c95755fd..1b85d6055159370457f8003d4734ed09dd4f6f90 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -204,9 +204,10 @@ static inline struct event *find_cache_event(int type)
        return event;
 }
 
-static void python_process_event(int cpu, void *data,
-                                int size __unused,
-                                unsigned long long nsecs, char *comm)
+static void python_process_event(union perf_event *pevent __unused,
+                                struct perf_sample *sample,
+                                struct perf_session *session __unused,
+                                struct thread *thread)
 {
        PyObject *handler, *retval, *context, *t, *obj, *dict = NULL;
        static char handler_name[256];
@@ -217,6 +218,10 @@ static void python_process_event(int cpu, void *data,
        unsigned n = 0;
        int type;
        int pid;
+       int cpu = sample->cpu;
+       void *data = sample->raw_data;
+       unsigned long long nsecs = sample->time;
+       char *comm = thread->comm;
 
        t = PyTuple_New(MAX_FIELDS);
        if (!t)

diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index f7af2fca965d5c206973f73ccd25b8b3607e02e5..66f4b78737ab355fc2c75510b37e04d9f57642bf 100644 (file)
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -36,11 +36,10 @@ static int stop_script_unsupported(void)
        return 0;
 }
 
-static void process_event_unsupported(int cpu __unused,
-                                     void *data __unused,
-                                     int size __unused,
-                                     unsigned long long nsecs __unused,
-                                     char *comm __unused)
+static void process_event_unsupported(union perf_event *event __unused,
+                                     struct perf_sample *sample __unused,
+                                     struct perf_session *session __unused,
+                                     struct thread *thread __unused)
 {
 }
 

diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index b5f12ca24d99f877877b701ae6f8b0d7f6b3acca..5f7b5139c3217554f558707c577ba799c396a194 100644 (file)
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 #include "parse-events.h"
+#include "session.h"
 
 #define __unused __attribute__((unused))
 
@@ -278,8 +279,10 @@ struct scripting_ops {
        const char *name;
        int (*start_script) (const char *script, int argc, const char **argv);
        int (*stop_script) (void);
-       void (*process_event) (int cpu, void *data, int size,
-                              unsigned long long nsecs, char *comm);
+       void (*process_event) (union perf_event *event,
+                              struct perf_sample *sample,
+                              struct perf_session *session,
+                              struct thread *thread);
        int (*generate_script) (const char *outfile);
 };