trace-cmd/pevent: Remove passing of cpu to pevent prasing functions

Now that the struct record holds the cpu information, there's no need
to pass the cpu number to the pevent parsing routines.

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

7 files changed, 21 insertions, 20 deletions

diff --git a/parse-events.c b/parse-events.c
index d53184b..24ecb85 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -3216,10 +3216,10 @@ 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, struct record *record)
+                       struct record *record)
 {
         if (event->handler)
-                event->handler(s, record, event, cpu);
+                event->handler(s, record, event);
         else
                 pretty_print(s, record->data, record->size, event);
 
@@ -3227,7 +3227,7 @@ void pevent_event_info(struct trace_seq *s, struct event_format *event,
 }
 
 void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
-                        int cpu, struct record *record)
+                        struct record *record)
 {
         static char *spaces = "                    "; /* 20 spaces */
         struct event_format *event;
@@ -3257,10 +3257,10 @@ 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);
+                       comm, pid, record->cpu);
                 pevent_data_lat_fmt(pevent, s, record);
         } else
-                trace_seq_printf(s, "%16s-%-5d [%03d]", comm, pid,  cpu);
+                trace_seq_printf(s, "%16s-%-5d [%03d]", comm, pid, record->cpu);
 
         trace_seq_printf(s, " %5lu.%06lu: %s: ", secs, usecs, event->name);
 
@@ -3270,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, record, event, cpu);
+                event->handler(s, record, event);
         else
                 pretty_print(s, data, size, event);
 
diff --git a/parse-events.h b/parse-events.h
index b4135a4..00bdc44 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -63,7 +63,7 @@ struct event_format;
 
 typedef int (*pevent_event_handler_func)(struct trace_seq *s,
                                          struct record *record,
-                                         struct event_format *event, int cpu);
+                                         struct event_format *event);
 
 typedef int (*pevent_plugin_load_func)(struct pevent *pevent);
 
@@ -350,7 +350,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, struct record *record);
+                        struct record *record);
 
 int pevent_parse_header_page(struct pevent *pevent, char *buf, unsigned long size);
 
@@ -380,7 +380,7 @@ 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, struct record *record);
+                       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 2833f1b..afc5afe 100644
--- a/plugin_hrtimer.c
+++ b/plugin_hrtimer.c
@@ -31,7 +31,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, int cpu)
+                                struct event_format *event)
 {
         void *data = record->data;
 
@@ -48,7 +48,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, int cpu)
+                               struct event_format *event)
 {
         struct pevent *pevent = event->pevent;
         struct format_field *fn = pevent_find_field(event, "function");
diff --git a/plugin_mac80211.c b/plugin_mac80211.c
index dd76d7c..497d564 100644
--- a/plugin_mac80211.c
+++ b/plugin_mac80211.c
@@ -146,7 +146,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, int cpu)
+                                struct event_format *event)
 {
         void *data = record->data;
 
@@ -174,7 +174,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, int cpu)
+                      struct event_format *event)
 {
         void *data = record->data;
 
diff --git a/plugin_sched_switch.c b/plugin_sched_switch.c
index 3cec83c..0f3b857 100644
--- a/plugin_sched_switch.c
+++ b/plugin_sched_switch.c
@@ -48,7 +48,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, int cpu)
+                                struct event_format *event)
 {
         struct format_field *field;
         unsigned long long val;
@@ -103,7 +103,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, int cpu)
+                                struct event_format *event)
 {
         struct format_field *field;
         unsigned long long val;
diff --git a/trace-ftrace.c b/trace-ftrace.c
index 6b4ab8e..0920430 100644
--- a/trace-ftrace.c
+++ b/trace-ftrace.c
@@ -29,7 +29,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, int cpu)
+                            struct event_format *event)
 {
         struct pevent *pevent = event->pevent;
         unsigned long long function;
@@ -221,13 +221,14 @@ 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, int cpu)
+                   struct event_format *event)
 {
         struct record *rec;
         void *copy_data;
         unsigned long long val, pid;
         void *data = record->data;
         int size = record->size;
+        int cpu = record->cpu;
         int ret;
 
         if (get_field_val(s, data, event, "common_pid", &pid))
@@ -260,7 +261,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, int cpu)
+                   struct event_format *event)
 {
         unsigned long long rettime, calltime;
         unsigned long long duration, depth;
@@ -293,7 +294,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, int cpu)
+                    struct event_format *event)
 {
         struct format_field *field;
         unsigned long long addr;
diff --git a/trace-read.c b/trace-read.c
index 48bec1d..a7cac1e 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);
+        pevent_print_event(pevent, &s, record);
         trace_seq_do_printf(&s);
         printf("\n");