7 files changed, 41 insertions, 33 deletions

diff --git a/parse-events.c b/parse-events.c
index 9873ef0..e48900a 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -59,6 +59,7 @@ struct event_handler {
         const char                      *sys_name;
         const char                      *event_name;
         pevent_event_handler_func       func;
+        void                            *context;
 };
 
 struct pevent_func_params {
@@ -3780,7 +3781,8 @@ void pevent_event_info(struct trace_seq *s, struct event_format *event,
         else {
 
                 if (event->handler)
-                        print_pretty = event->handler(s, record, event);
+                        print_pretty = event->handler(s, record, event,
+                                                      event->context);
 
                 if (print_pretty)
                         pretty_print(s, record->data, record->size, event);
@@ -4234,6 +4236,7 @@ static int find_event_handle(struct pevent *pevent, struct event_format *event)
                 event->id, event->system, event->name);
 
         event->handler = handle->func;
+        event->context = handle->context;
 
         *next = handle->next;
         free_handler(handle);
@@ -4454,7 +4457,8 @@ int pevent_register_print_function(struct pevent *pevent,
  */
 int pevent_register_event_handler(struct pevent *pevent,
                                   int id, char *sys_name, char *event_name,
-                                  pevent_event_handler_func func)
+                                  pevent_event_handler_func func,
+                                  void *context)
 {
         struct event_format *event;
         struct event_handler *handle;
@@ -4478,6 +4482,7 @@ int pevent_register_event_handler(struct pevent *pevent,
                 event->id, event->system, event->name);
 
         event->handler = func;
+        event->context = context;
         return 0;
 
  not_found:
@@ -4493,6 +4498,7 @@ int pevent_register_event_handler(struct pevent *pevent,
         handle->func = func;
         handle->next = pevent->handlers;
         pevent->handlers = handle;
+        handle->context = context;
 
         return -1;
 }
diff --git a/parse-events.h b/parse-events.h
index 0283f57..7d1c42e 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -87,7 +87,8 @@ struct event_format;
 
 typedef int (*pevent_event_handler_func)(struct trace_seq *s,
                                          struct record *record,
-                                         struct event_format *event);
+                                         struct event_format *event,
+                                         void *context);
 
 typedef int (*pevent_plugin_load_func)(struct pevent *pevent);
 typedef int (*pevent_plugin_unload_func)(void);
@@ -230,6 +231,7 @@ struct event_format {
         struct print_fmt        print_fmt;
         char                    *system;
         pevent_event_handler_func handler;
+        void                    *context;
 };
 
 enum {
@@ -428,7 +430,7 @@ int pevent_parse_header_page(struct pevent *pevent, char *buf, unsigned long siz
 int pevent_parse_event(struct pevent *pevent, char *buf, unsigned long size, char *sys);
 
 int pevent_register_event_handler(struct pevent *pevent, int id, char *sys_name, char *event_name,
-                                  pevent_event_handler_func func);
+                                  pevent_event_handler_func func, void *context);
 int pevent_register_print_function(struct pevent *pevent,
                                    pevent_func_handler func,
                                    enum pevent_func_arg_type ret_type,
diff --git a/plugin_hrtimer.c b/plugin_hrtimer.c
index a326bf0..eafcbbd 100644
--- a/plugin_hrtimer.c
+++ b/plugin_hrtimer.c
@@ -52,7 +52,7 @@ static void print_field(struct trace_seq *s, const char *fmt,
 }
 
 static int timer_expire_handler(struct trace_seq *s, struct record *record,
-                                struct event_format *event)
+                                struct event_format *event, void *context)
 {
         void *data = record->data;
 
@@ -69,7 +69,7 @@ static int timer_expire_handler(struct trace_seq *s, struct record *record,
 }
 
 static int timer_start_handler(struct trace_seq *s, struct record *record,
-                               struct event_format *event)
+                               struct event_format *event, void *context)
 {
         struct pevent *pevent = event->pevent;
         struct format_field *fn = pevent_find_field(event, "function");
@@ -106,10 +106,10 @@ static int timer_start_handler(struct trace_seq *s, struct record *record,
 int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
 {
         pevent_register_event_handler(pevent, -1, "timer", "hrtimer_expire_entry",
-                                      timer_expire_handler);
+                                      timer_expire_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "timer", "hrtimer_start",
-                                      timer_start_handler);
+                                      timer_start_handler, NULL);
 
         return 0;
 }
diff --git a/plugin_kmem.c b/plugin_kmem.c
index bcf7af6..de50513 100644
--- a/plugin_kmem.c
+++ b/plugin_kmem.c
@@ -25,7 +25,7 @@
 #include "trace-cmd.h"
 
 static int call_site_handler(struct trace_seq *s, struct record *record,
-                             struct event_format *event)
+                             struct event_format *event, void *context)
 {
         struct format_field *field;
         unsigned long long val, addr;
@@ -52,25 +52,25 @@ static int call_site_handler(struct trace_seq *s, struct record *record,
 int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
 {
         pevent_register_event_handler(pevent, -1, "kmem", "kfree",
-                                      call_site_handler);
+                                      call_site_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "kmem", "kmalloc",
-                                      call_site_handler);
+                                      call_site_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "kmem", "kmalloc_node",
-                                      call_site_handler);
+                                      call_site_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "kmem", "kmem_cache_alloc",
-                                      call_site_handler);
+                                      call_site_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "kmem", "kmem_cache_alloc_node",
-                                      call_site_handler);
+                                      call_site_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "kmem", "kfree",
-                                      call_site_handler);
+                                      call_site_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "kmem", "kmem_cache_free",
-                                      call_site_handler);
+                                      call_site_handler, NULL);
 
         return 0;
 }
diff --git a/plugin_mac80211.c b/plugin_mac80211.c
index 6aeb256..e194ec2 100644
--- a/plugin_mac80211.c
+++ b/plugin_mac80211.c
@@ -166,7 +166,7 @@ static void _print_flag(struct trace_seq *s, struct event_format *event,
 #define SP()    trace_seq_putc(s, ' ')
 
 static int drv_bss_info_changed(struct trace_seq *s, struct record *record,
-                                struct event_format *event)
+                                struct event_format *event, void *context)
 {
         void *data = record->data;
 
@@ -194,7 +194,7 @@ static int drv_bss_info_changed(struct trace_seq *s, struct record *record,
 }
 
 static int drv_config(struct trace_seq *s, struct record *record,
-                      struct event_format *event)
+                      struct event_format *event, void *context)
 {
         void *data = record->data;
 
@@ -221,9 +221,9 @@ static int drv_config(struct trace_seq *s, struct record *record,
 int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
 {
         pevent_register_event_handler(pevent, -1, "mac80211", "drv_bss_info_changed",
-                                      drv_bss_info_changed);
+                                      drv_bss_info_changed, NULL);
         pevent_register_event_handler(pevent, -1, "mac80211", "drv_config",
-                                      drv_config);
+                                      drv_config, NULL);
 
         return 0;
 }
diff --git a/plugin_sched_switch.c b/plugin_sched_switch.c
index 358c764..01e8298 100644
--- a/plugin_sched_switch.c
+++ b/plugin_sched_switch.c
@@ -68,7 +68,7 @@ static void write_state(struct trace_seq *s, int val)
 }
 
 static int sched_wakeup_handler(struct trace_seq *s, struct record *record,
-                                struct event_format *event)
+                                struct event_format *event, void *context)
 {
         struct format_field *field;
         unsigned long long val;
@@ -126,7 +126,7 @@ static int sched_wakeup_handler(struct trace_seq *s, struct record *record,
 }
 
 static int sched_switch_handler(struct trace_seq *s, struct record *record,
-                                struct event_format *event)
+                                struct event_format *event, void *context)
 {
         struct format_field *field;
         unsigned long long val;
@@ -175,13 +175,13 @@ static int sched_switch_handler(struct trace_seq *s, struct record *record,
 int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
 {
         pevent_register_event_handler(pevent, -1, "sched", "sched_switch",
-                                      sched_switch_handler);
+                                      sched_switch_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "sched", "sched_wakeup",
-                                      sched_wakeup_handler);
+                                      sched_wakeup_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "sched", "sched_wakeup_new",
-                                      sched_wakeup_handler);
+                                      sched_wakeup_handler, NULL);
 
         return 0;
 }
diff --git a/trace-ftrace.c b/trace-ftrace.c
index 4e6f61d..af9ac8d 100644
--- a/trace-ftrace.c
+++ b/trace-ftrace.c
@@ -49,7 +49,7 @@ static int get_field_val(struct trace_seq *s, void *data,
 }
 
 static int function_handler(struct trace_seq *s, struct record *record,
-                            struct event_format *event)
+                            struct event_format *event, void *context)
 {
         struct pevent *pevent = event->pevent;
         unsigned long long function;
@@ -241,7 +241,7 @@ static int print_graph_nested(struct trace_seq *s,
 
 static int
 fgraph_ent_handler(struct trace_seq *s, struct record *record,
-                   struct event_format *event)
+                   struct event_format *event, void *context)
 {
         struct record *rec;
         unsigned long long val, pid;
@@ -273,7 +273,7 @@ fgraph_ent_handler(struct trace_seq *s, struct record *record,
 
 static int
 fgraph_ret_handler(struct trace_seq *s, struct record *record,
-                   struct event_format *event)
+                   struct event_format *event, void *context)
 {
         unsigned long long rettime, calltime;
         unsigned long long duration, depth;
@@ -308,7 +308,7 @@ fgraph_ret_handler(struct trace_seq *s, struct record *record,
 
 static int
 trace_stack_handler(struct trace_seq *s, struct record *record,
-                    struct event_format *event)
+                    struct event_format *event, void *context)
 {
         struct format_field *field;
         unsigned long long addr;
@@ -350,16 +350,16 @@ int tracecmd_ftrace_overrides(struct tracecmd_input *handle)
         pevent = tracecmd_get_pevent(handle);
 
         pevent_register_event_handler(pevent, -1, "ftrace", "function",
-                                      function_handler);
+                                      function_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "ftrace", "funcgraph_entry",
-                                      fgraph_ent_handler);
+                                      fgraph_ent_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "ftrace", "funcgraph_exit",
-                                      fgraph_ret_handler);
+                                      fgraph_ret_handler, NULL);
 
         pevent_register_event_handler(pevent, -1, "ftrace", "kernel_stack",
-                                      trace_stack_handler);
+                                      trace_stack_handler, NULL);
 
         /* Store the func ret id and event for later use */
         event = pevent_find_event_by_name(pevent, "ftrace", "funcgraph_exit");