1 files changed, 37 insertions, 76 deletions

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 30ef82aca885..a25a023965bb 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -729,46 +729,30 @@ struct trace_sched_handler {
         void (*switch_event)(struct trace_switch_event *,
                              struct machine *,
                              struct event_format *,
-                             int cpu,
-                             u64 timestamp,
-                             struct thread *thread);
+                             struct perf_sample *sample);
 
         void (*runtime_event)(struct trace_runtime_event *,
                               struct machine *,
-                              struct event_format *,
-                              int cpu,
-                              u64 timestamp,
-                              struct thread *thread);
+                              struct perf_sample *sample);
 
         void (*wakeup_event)(struct trace_wakeup_event *,
                              struct machine *,
                              struct event_format *,
-                             int cpu,
-                             u64 timestamp,
-                             struct thread *thread);
+                             struct perf_sample *sample);
 
         void (*fork_event)(struct trace_fork_event *,
-                           struct event_format *,
-                           int cpu,
-                           u64 timestamp,
-                           struct thread *thread);
+                           struct event_format *event);
 
         void (*migrate_task_event)(struct trace_migrate_task_event *,
-                           struct machine *machine,
-                           struct event_format *,
-                           int cpu,
-                           u64 timestamp,
-                           struct thread *thread);
+                                   struct machine *machine,
+                                   struct perf_sample *sample);
 };
 
 
 static void
 replay_wakeup_event(struct trace_wakeup_event *wakeup_event,
                     struct machine *machine __used,
-                    struct event_format *event,
-                    int cpu __used,
-                    u64 timestamp __used,
-                    struct thread *thread __used)
+                    struct event_format *event, struct perf_sample *sample)
 {
         struct task_desc *waker, *wakee;
 
@@ -784,7 +768,7 @@ replay_wakeup_event(struct trace_wakeup_event *wakeup_event,
         waker = register_pid(wakeup_event->common_pid, "<unknown>");
         wakee = register_pid(wakeup_event->pid, wakeup_event->comm);
 
-        add_sched_event_wakeup(waker, timestamp, wakee);
+        add_sched_event_wakeup(waker, sample->time, wakee);
 }
 
 static u64 cpu_last_switched[MAX_CPUS];
@@ -793,12 +777,11 @@ static void
 replay_switch_event(struct trace_switch_event *switch_event,
                     struct machine *machine __used,
                     struct event_format *event,
-                    int cpu,
-                    u64 timestamp,
-                    struct thread *thread __used)
+                    struct perf_sample *sample)
 {
         struct task_desc *prev, __used *next;
-        u64 timestamp0;
+        u64 timestamp0, timestamp = sample->time;
+        int cpu = sample->cpu;
         s64 delta;
 
         if (verbose)
@@ -835,10 +818,7 @@ replay_switch_event(struct trace_switch_event *switch_event,
 
 static void
 replay_fork_event(struct trace_fork_event *fork_event,
-                  struct event_format *event,
-                  int cpu __used,
-                  u64 timestamp __used,
-                  struct thread *thread __used)
+                  struct event_format *event)
 {
         if (verbose) {
                 printf("sched_fork event %p\n", event);
@@ -944,10 +924,7 @@ static void thread_atoms_insert(struct thread *thread)
 
 static void
 latency_fork_event(struct trace_fork_event *fork_event __used,
-                   struct event_format *event __used,
-                   int cpu __used,
-                   u64 timestamp __used,
-                   struct thread *thread __used)
+                   struct event_format *event __used)
 {
         /* should insert the newcomer */
 }
@@ -1027,13 +1004,12 @@ static void
 latency_switch_event(struct trace_switch_event *switch_event,
                      struct machine *machine,
                      struct event_format *event __used,
-                     int cpu,
-                     u64 timestamp,
-                     struct thread *thread __used)
+                     struct perf_sample *sample)
 {
         struct work_atoms *out_events, *in_events;
         struct thread *sched_out, *sched_in;
-        u64 timestamp0;
+        u64 timestamp0, timestamp = sample->time;
+        int cpu = sample->cpu;
         s64 delta;
 
         BUG_ON(cpu >= MAX_CPUS || cpu < 0);
@@ -1078,14 +1054,12 @@ latency_switch_event(struct trace_switch_event *switch_event,
 
 static void
 latency_runtime_event(struct trace_runtime_event *runtime_event,
-                     struct machine *machine,
-                     struct event_format *event __used,
-                     int cpu,
-                     u64 timestamp,
-                     struct thread *this_thread __used)
+                      struct machine *machine, struct perf_sample *sample)
 {
         struct thread *thread = machine__findnew_thread(machine, runtime_event->pid);
         struct work_atoms *atoms = thread_atoms_search(&atom_root, thread, &cmp_pid);
+        u64 timestamp = sample->time;
+        int cpu = sample->cpu;
 
         BUG_ON(cpu >= MAX_CPUS || cpu < 0);
         if (!atoms) {
@@ -1101,15 +1075,13 @@ latency_runtime_event(struct trace_runtime_event *runtime_event,
 
 static void
 latency_wakeup_event(struct trace_wakeup_event *wakeup_event,
-                     struct machine *machine,
-                     struct event_format *__event __used,
-                     int cpu __used,
-                     u64 timestamp,
-                     struct thread *thread __used)
+                     struct machine *machine, struct event_format *event __used,
+                     struct perf_sample *sample)
 {
         struct work_atoms *atoms;
         struct work_atom *atom;
         struct thread *wakee;
+        u64 timestamp = sample->time;
 
         /* Note for later, it may be interesting to observe the failing cases */
         if (!wakeup_event->success)
@@ -1149,12 +1121,9 @@ latency_wakeup_event(struct trace_wakeup_event *wakeup_event,
 
 static void
 latency_migrate_task_event(struct trace_migrate_task_event *migrate_task_event,
-                     struct machine *machine,
-                     struct event_format *__event __used,
-                     int cpu __used,
-                     u64 timestamp,
-                     struct thread *thread __used)
+                           struct machine *machine, struct perf_sample *sample)
 {
+        u64 timestamp = sample->time;
         struct work_atoms *atoms;
         struct work_atom *atom;
         struct thread *migrant;
@@ -1364,7 +1333,7 @@ process_sched_wakeup_event(struct perf_tool *tool __used,
                            struct event_format *event,