1 files changed, 25 insertions, 14 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index c2623c6f9b51..ce4d1b0c3862 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -37,7 +37,7 @@ PyMODINIT_FUNC initperf_trace_context(void);
 #define FTRACE_MAX_EVENT                                \
         ((1 << (sizeof(unsigned short) * 8)) - 1)
 
-struct event *events[FTRACE_MAX_EVENT];
+struct event_format *events[FTRACE_MAX_EVENT];
 
 #define MAX_FIELDS      64
 #define N_COMMON_FIELDS 7
@@ -136,7 +136,7 @@ static void define_field(enum print_arg_type field_type,
         Py_DECREF(t);
 }
 
-static void define_event_symbols(struct event *event,
+static void define_event_symbols(struct event_format *event,
                                  const char *ev_name,
                                  struct print_arg *args)
 {
@@ -166,6 +166,10 @@ static void define_event_symbols(struct event *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:
@@ -178,6 +182,10 @@ static void define_event_symbols(struct event *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;
         }
@@ -186,15 +194,16 @@ static void define_event_symbols(struct event *event,
                 define_event_symbols(event, ev_name, args->next);
 }
 
-static inline struct event *find_cache_event(int type)
+static inline
+struct event_format *find_cache_event(struct pevent *pevent, int type)
 {
         static char ev_name[256];
-        struct event *event;
+        struct event_format *event;
 
         if (events[type])
                 return events[type];
 
-        events[type] = event = trace_find_event(type);
+        events[type] = event = pevent_find_event(pevent, type);
         if (!event)
                 return NULL;
 
@@ -205,7 +214,8 @@ static inline struct event *find_cache_event(int type)
         return event;
 }
 
-static void python_process_event(union perf_event *pevent __unused,
+static void python_process_event(union perf_event *perf_event __unused,
+                                 struct pevent *pevent,
                                  struct perf_sample *sample,
                                  struct perf_evsel *evsel __unused,
                                  struct machine *machine __unused,
@@ -216,7 +226,7 @@ static void python_process_event(union perf_event *pevent __unused,
         struct format_field *field;
         unsigned long long val;
         unsigned long s, ns;
-        struct event *event;
+        struct event_format *event;
         unsigned n = 0;
         int type;
         int pid;
@@ -229,13 +239,13 @@ static void python_process_event(union perf_event *pevent __unused,
         if (!t)
                 Py_FatalError("couldn't create Python tuple");
 
-        type = trace_parse_common_type(data);
+        type = trace_parse_common_type(pevent, data);
 
-        event = find_cache_event(type);
+        event = find_cache_event(pevent, type);
         if (!event)
                 die("ug! no event found for type %d", type);
 
-        pid = trace_parse_common_pid(data);
+        pid = trace_parse_common_pid(pevent, data);
 
         sprintf(handler_name, "%s__%s", event->system, event->name);
 
@@ -280,7 +290,8 @@ static void python_process_event(union perf_event *pevent __unused,
                                 offset = field->offset;
                         obj = PyString_FromString((char *)data + offset);
                 } else { /* FIELD_IS_NUMERIC */
-                        val = read_size(data + field->offset, field->size);
+                        val = read_size(pevent, data + field->offset,
+                                        field->size);
                         if (field->flags & FIELD_IS_SIGNED) {
                                 if ((long long)val >= LONG_MIN &&
                                     (long long)val <= LONG_MAX)
@@ -434,9 +445,9 @@ out:
         return err;
 }
 
-static int python_generate_script(const char *outfile)
+static int python_generate_script(struct pevent *pevent, const char *outfile)
 {
-        struct event *event = NULL;
+        struct event_format *event = NULL;
         struct format_field *f;
         char fname[PATH_MAX];
         int not_first, count;
@@ -483,7 +494,7 @@ static int python_generate_script(const char *outfile)
         fprintf(ofp, "def trace_end():\n");
         fprintf(ofp, "\tprint \"in trace_end\"\n\n");
 
-        while ((event = trace_find_next_event(event))) {
+        while ((event = trace_find_next_event(pevent, event))) {
                 fprintf(ofp, "def %s__%s(", event->system, event->name);
                 fprintf(ofp, "event_name, ");
                 fprintf(ofp, "context, ");