trace-cmd: Pass in record to pevent functions

Instead of passing in the data, size and timestamp to the
pevent parsing routines, pass in the record itself. This allows
the pevent parsing routines to have a bit more control and facilitates
the need of future work where we need to know more about the record
in the parser.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

7 files changed, 52 insertions, 46 deletions

diff --git a/parse-events.c b/parse-events.c
index 49cde00..d53184b 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -3113,13 +3113,14 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
  * and lock depth) and places it into the trace_seq.
  */
 void pevent_data_lat_fmt(struct pevent *pevent,
-                         struct trace_seq *s, void *data, int size __unused)
+                         struct trace_seq *s, struct record *record)
 {
         unsigned int lat_flags;
         unsigned int pc;
         int lock_depth;
         int hardirq;
         int softirq;
+        void *data = record->data;
 
         lat_flags = parse_common_flags(pevent, data);
         pc = parse_common_pc(pevent, data);
@@ -3215,30 +3216,32 @@ const char *pevent_data_comm_from_pid(struct pevent *pevent, int pid)
  * writes the print format into the trace_seq.
  */
 void pevent_event_info(struct trace_seq *s, struct event_format *event,
-                       int cpu, void *data, int size, unsigned long long nsecs)
+                       int cpu, struct record *record)
 {
         if (event->handler)
-                event->handler(s, data, size, event, cpu, nsecs);
+                event->handler(s, record, event, cpu);
         else
-                pretty_print(s, data, size, event);
+                pretty_print(s, record->data, record->size, event);
 
         trace_seq_terminate(s);
 }
 
 void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
-                        int cpu, void *data, int size, unsigned long long nsecs)
+                        int cpu, struct record *record)
 {
         static char *spaces = "                    "; /* 20 spaces */
         struct event_format *event;
         unsigned long secs;
         unsigned long usecs;
         const char *comm;
+        void *data = record->data;
+        int size = record->size;
         int type;
         int pid;
         int len;
 
-        secs = nsecs / NSECS_PER_SEC;
-        usecs = nsecs - secs * NSECS_PER_SEC;
+        secs = record->ts / NSECS_PER_SEC;
+        usecs = record->ts - secs * NSECS_PER_SEC;
         usecs = usecs / NSECS_PER_USEC;
 
         type = trace_parse_common_type(pevent, data);
@@ -3255,7 +3258,7 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
         if (pevent->latency_format) {
                 trace_seq_printf(s, "%8.8s-%-5d %3d",
                        comm, pid, cpu);
-                pevent_data_lat_fmt(pevent, s, data, size);
+                pevent_data_lat_fmt(pevent, s, record);
         } else
                 trace_seq_printf(s, "%16s-%-5d [%03d]", comm, pid,  cpu);
 
@@ -3267,7 +3270,7 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
                 trace_seq_printf(s, "%.*s", 20 - len, spaces);
         
         if (event->handler)
-                event->handler(s, data, size, event, cpu, nsecs);
+                event->handler(s, record, event, cpu);
         else
                 pretty_print(s, data, size, event);
 
diff --git a/parse-events.h b/parse-events.h
index 9b64b9d..ba80efd 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -61,9 +61,8 @@ struct pevent;
 struct event_format;
 
 typedef int (*pevent_event_handler_func)(struct trace_seq *s,
-                                         void *data, int size,
-                                         struct event_format *event, int cpu,
-                                         unsigned long long nsecs);
+                                         struct record *record,
+                                         struct event_format *event, int cpu);
 
 typedef int (*pevent_plugin_load_func)(struct pevent *pevent);
 
@@ -350,7 +349,7 @@ int pevent_register_print_string(struct pevent *pevent, char *fmt,
 int pevent_pid_is_registered(struct pevent *pevent, int pid);
 
 void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
-                        int cpu, void *data, int size, unsigned long long nsecs);
+                        int cpu, struct record *record);
 
 int pevent_parse_header_page(struct pevent *pevent, char *buf, unsigned long size);
 
@@ -374,13 +373,13 @@ struct event_format *
 pevent_find_event_by_name(struct pevent *pevent, const char *sys, const char *name);
 
 void pevent_data_lat_fmt(struct pevent *pevent,
-                         struct trace_seq *s, void *data, int size __unused);
+                         struct trace_seq *s, struct record *record);
 int pevent_data_type(struct pevent *pevent, struct record *rec);
 struct event_format *pevent_data_event_from_type(struct pevent *pevent, int type);
 int pevent_data_pid(struct pevent *pevent, struct record *rec);
 const char *pevent_data_comm_from_pid(struct pevent *pevent, int pid);
 void pevent_event_info(struct trace_seq *s, struct event_format *event,
-                       int cpu, void *data, int size, unsigned long long nsecs);
+                       int cpu, struct record *record);
 
 struct event_format **pevent_list_events(struct pevent *pevent, enum event_sort_type);
 
diff --git a/plugin_hrtimer.c b/plugin_hrtimer.c
index 01f8ff3..2833f1b 100644
--- a/plugin_hrtimer.c
+++ b/plugin_hrtimer.c
@@ -30,10 +30,11 @@ static void print_field(struct trace_seq *s, const char *fmt,
                 trace_seq_printf(s, "CAN'T FIND FIELD \"%s\"", name);
 }
 
-static int timer_expire_handler(struct trace_seq *s, void *data, int size,
-                                struct event_format *event, int cpu,
-                                unsigned long long nsecs)
+static int timer_expire_handler(struct trace_seq *s, struct record *record,
+                                struct event_format *event, int cpu)
 {
+        void *data = record->data;
+
         trace_seq_printf(s, "hrtimer=");
 
         if (_print_field(s, "0x%llx", event, "timer", data) == -1)
@@ -46,12 +47,12 @@ static int timer_expire_handler(struct trace_seq *s, void *data, int size,
         return 0;
 }
 
-static int timer_start_handler(struct trace_seq *s, void *data, int size,
-                               struct event_format *event, int cpu,
-                               unsigned long long nsecs)
+static int timer_start_handler(struct trace_seq *s, struct record *record,
+                               struct event_format *event, int cpu)
 {
         struct pevent *pevent = event->pevent;
         struct format_field *fn = pevent_find_field(event, "function");
+        void *data = record->data;
 
         trace_seq_printf(s, "hrtimer=");
 
diff --git a/plugin_mac80211.c b/plugin_mac80211.c
index 766d9ce..dd76d7c 100644
--- a/plugin_mac80211.c
+++ b/plugin_mac80211.c
@@ -145,10 +145,11 @@ static void _print_flag(struct trace_seq *s, struct event_format *event,
 #define SFX(fn) _print_field(s, fn ":%#x", event, fn, data)
 #define SP()    trace_seq_putc(s, ' ')
 
-static int drv_bss_info_changed(struct trace_seq *s, void *data, int size,
-                                struct event_format *event, int cpu,
-                                unsigned long long nsecs)
+static int drv_bss_info_changed(struct trace_seq *s, struct record *record,
+                                struct event_format *event, int cpu)
 {
+        void *data = record->data;
+
         print_string(s, event, "wiphy_name", data);
         trace_seq_printf(s, " vif:");
         print_string(s, event, "vif_name", data);
@@ -172,10 +173,11 @@ static int drv_bss_info_changed(struct trace_seq *s, void *data, int size,
         return 0;
 }
 
-static int drv_config(struct trace_seq *s, void *data,
-                      int size, struct event_format *event, int cpu,
-                      unsigned long long nsecs)
+static int drv_config(struct trace_seq *s, struct record *record,
+                      struct event_format *event, int cpu)
 {
+        void *data = record->data;
+
         print_string(s, event, "wiphy_name", data);
         trace_seq_putc(s, ' ');
         print_flag(s, event, "flags", data,
diff --git a/plugin_sched_switch.c b/plugin_sched_switch.c
index 4690f2f..3cec83c 100644
--- a/plugin_sched_switch.c
+++ b/plugin_sched_switch.c
@@ -47,12 +47,12 @@ static void write_state(struct trace_seq *s, int val)
                 trace_seq_putc(s, 'R');
 }
 
-static int sched_wakeup_handler(struct trace_seq *s, void *data, int size,
-                                struct event_format *event, int cpu,
-                                unsigned long long nsecs)
+static int sched_wakeup_handler(struct trace_seq *s, struct record *record,
+                                struct event_format *event, int cpu)
 {
         struct format_field *field;
         unsigned long long val;
+        void *data = record->data;
 
         if (get_field_val(s, data, event, "common_pid", &val, 1))
                 return trace_seq_putc(s, '!');
@@ -102,12 +102,12 @@ static int sched_wakeup_handler(struct trace_seq *s, void *data, int size,
         return 0;
 }
 
-static int sched_switch_handler(struct trace_seq *s, void *data, int size,
-                                struct event_format *event, int cpu,
-                                unsigned long long nsecs)
+static int sched_switch_handler(struct trace_seq *s, struct record *record,
+                                struct event_format *event, int cpu)
 {
         struct format_field *field;
         unsigned long long val;
+        void *data = record->data;
 
         if (get_field_val(s, data, event, "prev_pid", &val, 1))
                 return trace_seq_putc(s, '!');
diff --git a/trace-ftrace.c b/trace-ftrace.c
index 9dfe04d..6b4ab8e 100644
--- a/trace-ftrace.c
+++ b/trace-ftrace.c
@@ -28,13 +28,13 @@ static int get_field_val(struct trace_seq *s, void *data,
         return 0;
 }
 
-static int function_handler(struct trace_seq *s, void *data, int size,
-                            struct event_format *event, int cpu,
-                            unsigned long long nsecs)
+static int function_handler(struct trace_seq *s, struct record *record,
+                            struct event_format *event, int cpu)
 {
         struct pevent *pevent = event->pevent;
         unsigned long long function;
         const char *func;
+        void *data = record->data;
 
         if (get_field_val(s, data, event, "ip", &function))
                 return trace_seq_putc(s, '!');
@@ -220,13 +220,14 @@ static int print_graph_nested(struct trace_seq *s,
 }
 
 static int
-fgraph_ent_handler(struct trace_seq *s, void *data, int size,
-                   struct event_format *event, int cpu,
-                   unsigned long long nsecs)
+fgraph_ent_handler(struct trace_seq *s, struct record *record,
+                   struct event_format *event, int cpu)
 {
         struct record *rec;
         void *copy_data;
         unsigned long long val, pid;
+        void *data = record->data;
+        int size = record->size;
         int ret;
 
         if (get_field_val(s, data, event, "common_pid", &pid))
@@ -258,12 +259,12 @@ fgraph_ent_handler(struct trace_seq *s, void *data, int size,
 }
 
 static int
-fgraph_ret_handler(struct trace_seq *s, void *data, int size,
-                   struct event_format *event, int cpu,
-                   unsigned long long nsecs)
+fgraph_ret_handler(struct trace_seq *s, struct record *record,
+                   struct event_format *event, int cpu)
 {
         unsigned long long rettime, calltime;
         unsigned long long duration, depth;
+        void *data = record->data;
         int i;
 
         if (get_field_val(s, data, event, "rettime", &rettime))
@@ -291,13 +292,13 @@ fgraph_ret_handler(struct trace_seq *s, void *data, int size,
 }
 
 static int
-trace_stack_handler(struct trace_seq *s, void *data, int size,
-                    struct event_format *event, int cpu,
-                    unsigned long long nsecs)
+trace_stack_handler(struct trace_seq *s, struct record *record,
+                    struct event_format *event, int cpu)
 {
         struct format_field *field;
         unsigned long long addr;
         const char *func;
+        void *data = record->data;
         int ret;
         int i;
 
diff --git a/trace-read.c b/trace-read.c
index 5a5d4df..48bec1d 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -202,7 +202,7 @@ static void show_data(struct tracecmd_input *handle, int cpu)
         test_save(record, cpu);
 
         trace_seq_init(&s);
-        pevent_print_event(pevent, &s, cpu, record->data, record->size, record->ts);
+        pevent_print_event(pevent, &s, cpu, record);
         trace_seq_do_printf(&s);
         printf("\n");