Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / tools / perf / util / trace-event-scripting.c

diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
index 714581b..7172ca0 100644 (file)
--- a/tools/perf/util/trace-event-scripting.c
+++ b/tools/perf/util/trace-event-scripting.c
@@ -12,10 +12,31 @@
 
 #include "debug.h"
 #include "trace-event.h"
+#include "event.h"
+#include "evsel.h"
 #include <linux/zalloc.h>
 
 struct scripting_context *scripting_context;
 
+void scripting_context__update(struct scripting_context *c,
+                              union perf_event *event,
+                              struct perf_sample *sample,
+                              struct evsel *evsel,
+                              struct addr_location *al,
+                              struct addr_location *addr_al)
+{
+       c->event_data = sample->raw_data;
+       if (evsel->tp_format)
+               c->pevent = evsel->tp_format->tep;
+       else
+               c->pevent = NULL;
+       c->event = event;
+       c->sample = sample;
+       c->evsel = evsel;
+       c->al = al;
+       c->addr_al = addr_al;
+}
+
 static int flush_script_unsupported(void)
 {
        return 0;
@@ -29,7 +50,8 @@ static int stop_script_unsupported(void)
 static void process_event_unsupported(union perf_event *event __maybe_unused,
                                      struct perf_sample *sample __maybe_unused,
                                      struct evsel *evsel __maybe_unused,
-                                     struct addr_location *al __maybe_unused)
+                                     struct addr_location *al __maybe_unused,
+                                     struct addr_location *addr_al __maybe_unused)
 {
 }
 
@@ -44,7 +66,8 @@ static void print_python_unsupported_msg(void)
 
 static int python_start_script_unsupported(const char *script __maybe_unused,
                                           int argc __maybe_unused,
-                                          const char **argv __maybe_unused)
+                                          const char **argv __maybe_unused,
+                                          struct perf_session *session __maybe_unused)
 {
        print_python_unsupported_msg();
 
@@ -63,6 +86,7 @@ static int python_generate_script_unsupported(struct tep_handle *pevent
 
 struct scripting_ops python_scripting_unsupported_ops = {
        .name = "Python",
+       .dirname = "python",
        .start_script = python_start_script_unsupported,
        .flush_script = flush_script_unsupported,
        .stop_script = stop_script_unsupported,
@@ -108,7 +132,8 @@ static void print_perl_unsupported_msg(void)
 
 static int perl_start_script_unsupported(const char *script __maybe_unused,
                                         int argc __maybe_unused,
-                                        const char **argv __maybe_unused)
+                                        const char **argv __maybe_unused,
+                                        struct perf_session *session __maybe_unused)
 {
        print_perl_unsupported_msg();
 
@@ -126,6 +151,7 @@ static int perl_generate_script_unsupported(struct tep_handle *pevent
 
 struct scripting_ops perl_scripting_unsupported_ops = {
        .name = "Perl",
+       .dirname = "perl",
        .start_script = perl_start_script_unsupported,
        .flush_script = flush_script_unsupported,
        .stop_script = stop_script_unsupported,