Patched in Tegra support.

2 files changed, 46 insertions, 211 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index f80605eb185..74350ffb57f 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -25,16 +25,13 @@
 #include <ctype.h>
 #include <errno.h>
 
+#include "../../perf.h"
 #include "../util.h"
+#include "../trace-event.h"
+
 #include <EXTERN.h>
 #include <perl.h>
 
-#include "../../perf.h"
-#include "../thread.h"
-#include "../event.h"
-#include "../trace-event.h"
-#include "../evsel.h"
-
 void boot_Perf__Trace__Context(pTHX_ CV *cv);
 void boot_DynaLoader(pTHX_ CV *cv);
 typedef PerlInterpreter * INTERP;
@@ -56,7 +53,7 @@ INTERP my_perl;
 #define FTRACE_MAX_EVENT                                \
         ((1 << (sizeof(unsigned short) * 8)) - 1)
 
-struct event_format *events[FTRACE_MAX_EVENT];
+struct event *events[FTRACE_MAX_EVENT];
 
 extern struct scripting_context *scripting_context;
 
@@ -181,7 +178,7 @@ static void define_flag_field(const char *ev_name,
         LEAVE;
 }
 
-static void define_event_symbols(struct event_format *event,
+static void define_event_symbols(struct event *event,
                                  const char *ev_name,
                                  struct print_arg *args)
 {
@@ -209,12 +206,6 @@ static void define_event_symbols(struct event_format *event,
                 define_symbolic_values(args->symbol.symbols, ev_name,
                                        cur_field_name);
                 break;
-        case PRINT_HEX:
-                define_event_symbols(event, ev_name, args->hex.field);
-                define_event_symbols(event, ev_name, args->hex.size);
-                break;
-        case PRINT_BSTRING:
-        case PRINT_DYNAMIC_ARRAY:
         case PRINT_STRING:
                 break;
         case PRINT_TYPE:
@@ -226,9 +217,7 @@ static void define_event_symbols(struct event_format *event,
                 define_event_symbols(event, ev_name, args->op.left);
                 define_event_symbols(event, ev_name, args->op.right);
                 break;
-        case PRINT_FUNC:
         default:
-                pr_err("Unsupported print arg type\n");
                 /* we should warn... */
                 return;
         }
@@ -237,16 +226,15 @@ static void define_event_symbols(struct event_format *event,
                 define_event_symbols(event, ev_name, args->next);
 }
 
-static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
+static inline struct event *find_cache_event(int type)
 {
         static char ev_name[256];
-        struct event_format *event;
-        int type = evsel->attr.config;
+        struct event *event;
 
         if (events[type])
                 return events[type];
 
-        events[type] = event = evsel->tp_format;
+        events[type] = event = trace_find_event(type);
         if (!event)
                 return NULL;
 
@@ -257,34 +245,33 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
         return event;
 }
 
-static void perl_process_tracepoint(union perf_event *perf_event __maybe_unused,
-                                    struct perf_sample *sample,
-                                    struct perf_evsel *evsel,
-                                    struct machine *machine __maybe_unused,
-                                    struct addr_location *al)
+static void perl_process_event(union perf_event *pevent __unused,
+                               struct perf_sample *sample,
+                               struct perf_evsel *evsel,
+                               struct perf_session *session __unused,
+                               struct thread *thread)
 {
         struct format_field *field;
         static char handler[256];
         unsigned long long val;
         unsigned long s, ns;
-        struct event_format *event;
+        struct event *event;
+        int type;
         int pid;
         int cpu = sample->cpu;
         void *data = sample->raw_data;
         unsigned long long nsecs = sample->time;
-        struct thread *thread = al->thread;
         char *comm = thread->comm;
 
         dSP;
 
-        if (evsel->attr.type != PERF_TYPE_TRACEPOINT)
-                return;
+        type = trace_parse_common_type(data);
 
-        event = find_cache_event(evsel);
+        event = find_cache_event(type);
         if (!event)
-                die("ug! no event found for type %" PRIu64, evsel->attr.config);
+                die("ug! no event found for type %d", type);
 
-        pid = raw_field_value(event, "common_pid", data);
+        pid = trace_parse_common_pid(data);
 
         sprintf(handler, "%s::%s", event->system, event->name);
 
@@ -317,8 +304,7 @@ static void perl_process_tracepoint(union perf_event *perf_event __maybe_unused,
                                 offset = field->offset;
                         XPUSHs(sv_2mortal(newSVpv((char *)data + offset, 0)));
                 } else { /* FIELD_IS_NUMERIC */
-                        val = read_size(event, data + field->offset,
-                                        field->size);
+                        val = read_size(data + field->offset, field->size);
                         if (field->flags & FIELD_IS_SIGNED) {
                                 XPUSHs(sv_2mortal(newSViv(val)));
                         } else {
@@ -346,42 +332,6 @@ static void perl_process_tracepoint(union perf_event *perf_event __maybe_unused,
         LEAVE;
 }
 
-static void perl_process_event_generic(union perf_event *event,
-                                       struct perf_sample *sample,
-                                       struct perf_evsel *evsel,
-                                       struct machine *machine __maybe_unused,
-                                       struct addr_location *al __maybe_unused)
-{
-        dSP;
-
-        if (!get_cv("process_event", 0))
-                return;
-
-        ENTER;
-        SAVETMPS;
-        PUSHMARK(SP);
-        XPUSHs(sv_2mortal(newSVpvn((const char *)event, event->header.size)));
-        XPUSHs(sv_2mortal(newSVpvn((const char *)&evsel->attr, sizeof(evsel->attr))));
-        XPUSHs(sv_2mortal(newSVpvn((const char *)sample, sizeof(*sample))));
-        XPUSHs(sv_2mortal(newSVpvn((const char *)sample->raw_data, sample->raw_size)));
-        PUTBACK;
-        call_pv("process_event", G_SCALAR);
-        SPAGAIN;
-        PUTBACK;
-        FREETMPS;
-        LEAVE;
-}
-
-static void perl_process_event(union perf_event *event,
-                               struct perf_sample *sample,
-                               struct perf_evsel *evsel,
-                               struct machine *machine,
-                               struct addr_location *al)
-{
-        perl_process_tracepoint(event, sample, evsel, machine, al);
-        perl_process_event_generic(event, sample, evsel, machine, al);
-}
-
 static void run_start_sub(void)
 {
         dSP; /* access to Perl stack */
@@ -452,9 +402,9 @@ static int perl_stop_script(void)
         return 0;
 }
 
-static int perl_generate_script(struct pevent *pevent, const char *outfile)
+static int perl_generate_script(const char *outfile)
 {
-        struct event_format *event = NULL;
+        struct event *event = NULL;
         struct format_field *f;
         char fname[PATH_MAX];
         int not_first, count;
@@ -499,7 +449,7 @@ static int perl_generate_script(struct pevent *pevent, const char *outfile)
         fprintf(ofp, "sub trace_begin\n{\n\t# optional\n}\n\n");
         fprintf(ofp, "sub trace_end\n{\n\t# optional\n}\n\n");
 
-        while ((event = trace_find_next_event(pevent, event))) {
+        while ((event = trace_find_next_event(event))) {
                 fprintf(ofp, "sub %s::%s\n{\n", event->system, event->name);
                 fprintf(ofp, "\tmy (");
 
@@ -603,28 +553,7 @@ static int perl_generate_script(struct pevent *pevent, const char *outfile)
         fprintf(ofp, "sub print_header\n{\n"
                 "\tmy ($event_name, $cpu, $secs, $nsecs, $pid, $comm) = @_;\n\n"
                 "\tprintf(\"%%-20s %%5u %%05u.%%09u %%8u %%-20s \",\n\t       "
-                "$event_name, $cpu, $secs, $nsecs, $pid, $comm);\n}\n");
-
-        fprintf(ofp,
-                "\n# Packed byte string args of process_event():\n"
-                "#\n"
-                "# $event:\tunion perf_event\tutil/event.h\n"
-                "# $attr:\tstruct perf_event_attr\tlinux/perf_event.h\n"
-                "# $sample:\tstruct perf_sample\tutil/event.h\n"
-                "# $raw_data:\tperf_sample->raw_data\tutil/event.h\n"
-                "\n"
-                "sub process_event\n"
-                "{\n"
-                "\tmy ($event, $attr, $sample, $raw_data) = @_;\n"
-                "\n"
-                "\tmy @event\t= unpack(\"LSS\", $event);\n"
-                "\tmy @attr\t= unpack(\"LLQQQQQLLQQ\", $attr);\n"
-                "\tmy @sample\t= unpack(\"QLLQQQQQLL\", $sample);\n"
-                "\tmy @raw_data\t= unpack(\"C*\", $raw_data);\n"
-                "\n"
-                "\tuse Data::Dumper;\n"
-                "\tprint Dumper \\@event, \\@attr, \\@sample, \\@raw_data;\n"
-                "}\n");
+                "$event_name, $cpu, $secs, $nsecs, $pid, $comm);\n}");
 
         fclose(ofp);
 
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 14683dfca2e..6ccf70e8d8f 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -24,13 +24,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <errno.h>
 
 #include "../../perf.h"
-#include "../evsel.h"
 #include "../util.h"
-#include "../event.h"
-#include "../thread.h"
 #include "../trace-event.h"
 
 PyMODINIT_FUNC initperf_trace_context(void);
@@ -38,7 +36,7 @@ PyMODINIT_FUNC initperf_trace_context(void);
 #define FTRACE_MAX_EVENT                                \
         ((1 << (sizeof(unsigned short) * 8)) - 1)
 
-struct event_format *events[FTRACE_MAX_EVENT];
+struct event *events[FTRACE_MAX_EVENT];
 
 #define MAX_FIELDS      64
 #define N_COMMON_FIELDS 7
@@ -137,7 +135,7 @@ static void define_field(enum print_arg_type field_type,
         Py_DECREF(t);
 }
 
-static void define_event_symbols(struct event_format *event,
+static void define_event_symbols(struct event *event,
                                  const char *ev_name,
                                  struct print_arg *args)
 {
@@ -167,10 +165,6 @@ static void define_event_symbols(struct event_format *event,
                 define_values(PRINT_SYMBOL, args->symbol.symbols, ev_name,
                               cur_field_name);
                 break;
-        case PRINT_HEX:
-                define_event_symbols(event, ev_name, args->hex.field);
-                define_event_symbols(event, ev_name, args->hex.size);
-                break;
         case PRINT_STRING:
                 break;
         case PRINT_TYPE:
@@ -183,10 +177,6 @@ static void define_event_symbols(struct event_format *event,
                 define_event_symbols(event, ev_name, args->op.right);
                 break;
         default:
-                /* gcc warns for these? */
-        case PRINT_BSTRING:
-        case PRINT_DYNAMIC_ARRAY:
-        case PRINT_FUNC:
                 /* we should warn... */
                 return;
         }
@@ -195,21 +185,15 @@ static void define_event_symbols(struct event_format *event,
                 define_event_symbols(event, ev_name, args->next);
 }
 
-static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
+static inline struct event *find_cache_event(int type)
 {
         static char ev_name[256];
-        struct event_format *event;
-        int type = evsel->attr.config;
-
-        /*
-         * XXX: Do we really need to cache this since now we have evsel->tp_format
-         * cached already? Need to re-read this "cache" routine that as well calls
-         * define_event_symbols() :-\
-         */
+        struct event *event;
+
         if (events[type])
                 return events[type];
 
-        events[type] = event = evsel->tp_format;
+        events[type] = event = trace_find_event(type);
         if (!event)
                 return NULL;
 
@@ -220,36 +204,37 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
         return event;
 }
 
-static void python_process_tracepoint(union perf_event *perf_event
-                                      __maybe_unused,
+static void python_process_event(union perf_event *pevent __unused,
                                  struct perf_sample *sample,
-                                 struct perf_evsel *evsel,
-                                 struct machine *machine __maybe_unused,
-                                 struct addr_location *al)
+                                 struct perf_evsel *evsel __unused,
+                                 struct perf_session *session __unused,
+                                 struct thread *thread)
 {
         PyObject *handler, *retval, *context, *t, *obj, *dict = NULL;
         static char handler_name[256];
         struct format_field *field;
         unsigned long long val;
         unsigned long s, ns;
-        struct event_format *event;
+        struct event *event;
         unsigned n = 0;
+        int type;
         int pid;
         int cpu = sample->cpu;
         void *data = sample->raw_data;
         unsigned long long nsecs = sample->time;
-        struct thread *thread = al->thread;
         char *comm = thread->comm;
 
         t = PyTuple_New(MAX_FIELDS);
         if (!t)
                 Py_FatalError("couldn't create Python tuple");
 
-        event = find_cache_event(evsel);
+        type = trace_parse_common_type(data);
+
+        event = find_cache_event(type);
         if (!event)
-                die("ug! no event found for type %d", (int)evsel->attr.config);
+                die("ug! no event found for type %d", type);
 
-        pid = raw_field_value(event, "common_pid", data);
+        pid = trace_parse_common_pid(data);
 
         sprintf(handler_name, "%s__%s", event->system, event->name);
 
@@ -294,8 +279,7 @@ static void python_process_tracepoint(union perf_event *perf_event
                                 offset = field->offset;
                         obj = PyString_FromString((char *)data + offset);
                 } else { /* FIELD_IS_NUMERIC */
-                        val = read_size(event, data + field->offset,
-                                        field->size);
+                        val = read_size(data + field->offset, field->size);
                         if (field->flags & FIELD_IS_SIGNED) {
                                 if ((long long)val >= LONG_MIN &&
                                     (long long)val <= LONG_MAX)
@@ -339,84 +323,6 @@ static void python_process_tracepoint(union perf_event *perf_event
         Py_DECREF(t);
 }
 
-static void python_process_general_event(union perf_event *perf_event
-                                         __maybe_unused,
-                                         struct perf_sample *sample,
-                                         struct perf_evsel *evsel,
-                                         struct machine *machine __maybe_unused,
-                                         struct addr_location *al)
-{
-        PyObject *handler, *retval, *t, *dict;
-        static char handler_name[64];
-        unsigned n = 0;
-        struct thread *thread = al->thread;
-
-        /*
-         * Use the MAX_FIELDS to make the function expandable, though
-         * currently there is only one item for the tuple.
-         */
-        t = PyTuple_New(MAX_FIELDS);
-        if (!t)
-                Py_FatalError("couldn't create Python tuple");
-
-        dict = PyDict_New();
-        if (!dict)
-                Py_FatalError("couldn't create Python dictionary");
-
-        snprintf(handler_name, sizeof(handler_name), "%s", "process_event");
-
-        handler = PyDict_GetItemString(main_dict, handler_name);
-        if (!handler || !PyCallable_Check(handler))
-                goto exit;
-
-        PyDict_SetItemString(dict, "ev_name", PyString_FromString(perf_evsel__name(evsel)));
-        PyDict_SetItemString(dict, "attr", PyString_FromStringAndSize(
-                        (const char *)&evsel->attr, sizeof(evsel->attr)));
-        PyDict_SetItemString(dict, "sample", PyString_FromStringAndSize(
-                        (const char *)sample, sizeof(*sample)));
-        PyDict_SetItemString(dict, "raw_buf", PyString_FromStringAndSize(
-                        (const char *)sample->raw_data, sample->raw_size));
-        PyDict_SetItemString(dict, "comm",
-                        PyString_FromString(thread->comm));
-        if (al->map) {
-                PyDict_SetItemString(dict, "dso",
-                        PyString_FromString(al->map->dso->name));
-        }
-        if (al->sym) {
-                PyDict_SetItemString(dict, "symbol",
-                        PyString_FromString(al->sym->name));
-        }
-
-        PyTuple_SetItem(t, n++, dict);
-        if (_PyTuple_Resize(&t, n) == -1)
-                Py_FatalError("error resizing Python tuple");
-
-        retval = PyObject_CallObject(handler, t);
-        if (retval == NULL)
-                handler_call_die(handler_name);
-exit:
-        Py_DECREF(dict);
-        Py_DECREF(t);
-}
-
-static void python_process_event(union perf_event *perf_event,
-                                 struct perf_sample *sample,
-                                 struct perf_evsel *evsel,
-                                 struct machine *machine,
-                                 struct addr_location *al)
-{
-        switch (evsel->attr.type) {
-        case PERF_TYPE_TRACEPOINT:
-                python_process_tracepoint(perf_event, sample, evsel,
-                                          machine, al);
-                break;
-        /* Reserve for future process_hw/sw/raw APIs */
-        default:
-                python_process_general_event(perf_event, sample, evsel,
-                                             machine, al);
-        }
-}
-
 static int run_start_sub(void)
 {
         PyObject *handler, *retval;
@@ -527,9 +433,9 @@ out:
         return err;
 }
 
-static int python_generate_script(struct pevent *pevent, const char *outfile)
+static int python_generate_script(const char *outfile)
 {
-        struct event_format *event = NULL;
+        struct event *event = NULL;
         struct format_field *f;
         char fname[PATH_MAX];
         int not_first, count;
@@ -576,7 +482,7 @@ static int python_generate_script(struct pevent *pevent, const char *outfile)
         fprintf(ofp, "def trace_end():\n");
         fprintf(ofp, "\tprint \"in trace_end\"\n\n");
 
-        while ((event = trace_find_next_event(pevent, event))) {
+        while ((event = trace_find_next_event(event))) {
                 fprintf(ofp, "def %s__%s(", event->system, event->name);
                 fprintf(ofp, "event_name, ");
                 fprintf(ofp, "context, ");