1 files changed, 60 insertions, 157 deletions

diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 4069c43f4187..cfceb0b73e20 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -26,7 +26,7 @@ TRACE_EVENT(sched_kthread_stop,
                 __entry->pid    = t->pid;
         ),
 
-        TP_printk("task %s:%d", __entry->comm, __entry->pid)
+        TP_printk("comm=%s pid=%d", __entry->comm, __entry->pid)
 );
 
 /*
@@ -46,7 +46,7 @@ TRACE_EVENT(sched_kthread_stop_ret,
                 __entry->ret    = ret;
         ),
 
-        TP_printk("ret %d", __entry->ret)
+        TP_printk("ret=%d", __entry->ret)
 );
 
 /*
@@ -73,7 +73,7 @@ TRACE_EVENT(sched_wait_task,
                 __entry->prio   = p->prio;
         ),
 
-        TP_printk("task %s:%d [%d]",
+        TP_printk("comm=%s pid=%d prio=%d",
                   __entry->comm, __entry->pid, __entry->prio)
 );
 
@@ -83,7 +83,7 @@ TRACE_EVENT(sched_wait_task,
  * (NOTE: the 'rq' argument is not used by generic trace events,
  *        but used by the latency tracer plugin. )
  */
-TRACE_EVENT(sched_wakeup,
+DECLARE_EVENT_CLASS(sched_wakeup_template,
 
         TP_PROTO(struct rq *rq, struct task_struct *p, int success),
 
@@ -94,7 +94,7 @@ TRACE_EVENT(sched_wakeup,
                 __field(        pid_t,  pid                     )
                 __field(        int,    prio                    )
                 __field(        int,    success                 )
-                __field(        int,    cpu                     )
+                __field(        int,    target_cpu              )
         ),
 
         TP_fast_assign(
@@ -102,46 +102,27 @@ TRACE_EVENT(sched_wakeup,
                 __entry->pid            = p->pid;
                 __entry->prio           = p->prio;
                 __entry->success        = success;
-                __entry->cpu            = task_cpu(p);
+                __entry->target_cpu     = task_cpu(p);
         ),
 
-        TP_printk("task %s:%d [%d] success=%d [%03d]",
+        TP_printk("comm=%s pid=%d prio=%d success=%d target_cpu=%03d",
                   __entry->comm, __entry->pid, __entry->prio,
-                  __entry->success, __entry->cpu)
+                  __entry->success, __entry->target_cpu)
 );
 
+DEFINE_EVENT(sched_wakeup_template, sched_wakeup,
+             TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+             TP_ARGS(rq, p, success));
+
 /*
  * Tracepoint for waking up a new task:
  *
  * (NOTE: the 'rq' argument is not used by generic trace events,
  *        but used by the latency tracer plugin. )
  */
-TRACE_EVENT(sched_wakeup_new,
-
-        TP_PROTO(struct rq *rq, struct task_struct *p, int success),
-
-        TP_ARGS(rq, p, success),
-
-        TP_STRUCT__entry(
-                __array(        char,   comm,   TASK_COMM_LEN   )
-                __field(        pid_t,  pid                     )
-                __field(        int,    prio                    )
-                __field(        int,    success                 )
-                __field(        int,    cpu                     )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
-                __entry->pid            = p->pid;
-                __entry->prio           = p->prio;
-                __entry->success        = success;
-                __entry->cpu            = task_cpu(p);
-        ),
-
-        TP_printk("task %s:%d [%d] success=%d [%03d]",
-                  __entry->comm, __entry->pid, __entry->prio,
-                  __entry->success, __entry->cpu)
-);
+DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,
+             TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+             TP_ARGS(rq, p, success));
 
 /*
  * Tracepoint for task switches, performed by the scheduler:
@@ -176,7 +157,7 @@ TRACE_EVENT(sched_switch,
                 __entry->next_prio      = next->prio;
         ),
 
-        TP_printk("task %s:%d [%d] (%s) ==> %s:%d [%d]",
+        TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s ==> next_comm=%s next_pid=%d next_prio=%d",
                 __entry->prev_comm, __entry->prev_pid, __entry->prev_prio,
                 __entry->prev_state ?
                   __print_flags(__entry->prev_state, "|",
@@ -211,15 +192,12 @@ TRACE_EVENT(sched_migrate_task,
                 __entry->dest_cpu       = dest_cpu;
         ),
 
-        TP_printk("task %s:%d [%d] from: %d  to: %d",
+        TP_printk("comm=%s pid=%d prio=%d orig_cpu=%d dest_cpu=%d",
                   __entry->comm, __entry->pid, __entry->prio,
                   __entry->orig_cpu, __entry->dest_cpu)
 );
 
-/*
- * Tracepoint for freeing a task:
- */
-TRACE_EVENT(sched_process_free,
+DECLARE_EVENT_CLASS(sched_process_template,
 
         TP_PROTO(struct task_struct *p),
 
@@ -237,34 +215,24 @@ TRACE_EVENT(sched_process_free,
                 __entry->prio           = p->prio;
         ),
 
-        TP_printk("task %s:%d [%d]",
+        TP_printk("comm=%s pid=%d prio=%d",
                   __entry->comm, __entry->pid, __entry->prio)
 );
 
 /*
- * Tracepoint for a task exiting:
+ * Tracepoint for freeing a task:
  */
-TRACE_EVENT(sched_process_exit,
+DEFINE_EVENT(sched_process_template, sched_process_free,
+             TP_PROTO(struct task_struct *p),
+             TP_ARGS(p));
+             
 
-        TP_PROTO(struct task_struct *p),
-
-        TP_ARGS(p),
-
-        TP_STRUCT__entry(
-                __array(        char,   comm,   TASK_COMM_LEN   )
-                __field(        pid_t,  pid                     )
-                __field(        int,    prio                    )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
-                __entry->pid            = p->pid;
-                __entry->prio           = p->prio;
-        ),
-
-        TP_printk("task %s:%d [%d]",
-                  __entry->comm, __entry->pid, __entry->prio)
-);
+/*
+ * Tracepoint for a task exiting:
+ */
+DEFINE_EVENT(sched_process_template, sched_process_exit,
+             TP_PROTO(struct task_struct *p),
+             TP_ARGS(p));
 
 /*
  * Tracepoint for a waiting task:
@@ -287,7 +255,7 @@ TRACE_EVENT(sched_process_wait,
                 __entry->prio           = current->prio;
         ),
 
-        TP_printk("task %s:%d [%d]",
+        TP_printk("comm=%s pid=%d prio=%d",
                   __entry->comm, __entry->pid, __entry->prio)
 );
 
@@ -314,46 +282,16 @@ TRACE_EVENT(sched_process_fork,
                 __entry->child_pid      = child->pid;
         ),
 
-        TP_printk("parent %s:%d  child %s:%d",
+        TP_printk("comm=%s pid=%d child_comm=%s child_pid=%d",
                 __entry->parent_comm, __entry->parent_pid,
                 __entry->child_comm, __entry->child_pid)
 );
 
 /*
- * Tracepoint for sending a signal:
- */
-TRACE_EVENT(sched_signal_send,
-
-        TP_PROTO(int sig, struct task_struct *p),
-
-        TP_ARGS(sig, p),
-
-        TP_STRUCT__entry(
-                __field(        int,    sig                     )
-                __array(        char,   comm,   TASK_COMM_LEN   )
-                __field(        pid_t,  pid                     )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
-                __entry->pid    = p->pid;
-                __entry->sig    = sig;
-        ),
-
-        TP_printk("sig: %d  task %s:%d",
-                  __entry->sig, __entry->comm, __entry->pid)
-);
-
-/*
  * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
  *     adding sched_stat support to SCHED_FIFO/RR would be welcome.
  */
-
-/*
- * Tracepoint for accounting wait time (time the task is runnable
- * but not actually running due to scheduler contention).
- */
-TRACE_EVENT(sched_stat_wait,
+DECLARE_EVENT_CLASS(sched_stat_template,
 
         TP_PROTO(struct task_struct *tsk, u64 delay),
 
@@ -374,11 +312,36 @@ TRACE_EVENT(sched_stat_wait,
                 __perf_count(delay);
         ),
 
-        TP_printk("task: %s:%d wait: %Lu [ns]",
+        TP_printk("comm=%s pid=%d delay=%Lu [ns]",
                         __entry->comm, __entry->pid,
                         (unsigned long long)__entry->delay)
 );
 
+
+/*
+ * Tracepoint for accounting wait time (time the task is runnable
+ * but not actually running due to scheduler contention).
+ */
+DEFINE_EVENT(sched_stat_template, sched_stat_wait,
+             TP_PROTO(struct task_struct *tsk, u64 delay),
+             TP_ARGS(tsk, delay));
+
+/*
+ * Tracepoint for accounting sleep time (time the task is not runnable,
+ * including iowait, see below).
+ */
+DEFINE_EVENT(sched_stat_template, sched_stat_sleep,
+             TP_PROTO(struct task_struct *tsk, u64 delay),
+             TP_ARGS(tsk, delay));
+
+/*
+ * Tracepoint for accounting iowait time (time the task is not runnable
+ * due to waiting on IO to complete).
+ */
+DEFINE_EVENT(sched_stat_template, sched_stat_iowait,
+             TP_PROTO(struct task_struct *tsk, u64 delay),
+             TP_ARGS(tsk, delay));
+
 /*
  * Tracepoint for accounting runtime (time the task is executing
  * on a CPU).
@@ -406,72 +369,12 @@ TRACE_EVENT(sched_stat_runtime,
                 __perf_count(runtime);
         ),
 
-        TP_printk("task: %s:%d runtime: %Lu [ns], vruntime: %Lu [ns]",
+        TP_printk("comm=%s pid=%d runtime=%Lu [ns] vruntime=%Lu [ns]",
                         __entry->comm, __entry->pid,
                         (unsigned long long)__entry->runtime,
                         (unsigned long long)__entry->vruntime)
 );
 
-/*
- * Tracepoint for accounting sleep time (time the task is not runnable,
- * including iowait, see below).
- */
-TRACE_EVENT(sched_stat_sleep,
-
-        TP_PROTO(struct task_struct *tsk, u64 delay),
-
-        TP_ARGS(tsk, delay),
-
-        TP_STRUCT__entry(
-                __array( char,  comm,   TASK_COMM_LEN   )
-                __field( pid_t, pid                     )
-                __field( u64,   delay                   )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);
-                __entry->pid    = tsk->pid;
-                __entry->delay  = delay;
-        )
-        TP_perf_assign(
-                __perf_count(delay);
-        ),
-
-        TP_printk("task: %s:%d sleep: %Lu [ns]",
-                        __entry->comm, __entry->pid,
-                        (unsigned long long)__entry->delay)
-);
-
-/*
- * Tracepoint for accounting iowait time (time the task is not runnable
- * due to waiting on IO to complete).
- */
-TRACE_EVENT(sched_stat_iowait,
-
-        TP_PROTO(struct task_struct *tsk, u64 delay),
-
-        TP_ARGS(tsk, delay),
-
-        TP_STRUCT__entry(
-                __array( char,  comm,   TASK_COMM_LEN   )
-                __field( pid_t, pid                     )
-                __field( u64,   delay                   )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);
-                __entry->pid    = tsk->pid;
-                __entry->delay  = delay;
-        )
-        TP_perf_assign(
-                __perf_count(delay);
-        ),
-
-        TP_printk("task: %s:%d iowait: %Lu [ns]",
-                        __entry->comm, __entry->pid,
-                        (unsigned long long)__entry->delay)
-);
-
 #endif /* _TRACE_SCHED_H */
 
 /* This part must be outside protection */