1 files changed, 34 insertions, 42 deletions

diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index 7ba7332a8ebc..474aa129c233 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -85,14 +85,13 @@ TRACE_EVENT(litmus_switch_to,
         ),
 
         TP_fast_assign(
-                       __entry->pid     = t->pid;//is_realtime(t) ? t->pid : 0;
-                       __entry->job     = t->rt_param.job_params.job_no;//is_realtime(t) ? t->rt_param.job_params.job_no : 0;
+                __entry->pid    = is_realtime(t) ? t->pid : 0;
+                __entry->job    = is_realtime(t) ? t->rt_param.job_params.job_no : 0;
                 __entry->exec_time      = get_exec_time(t);
         ),
 
         TP_printk("switch_to(job(%u, %u)): (exec: %Lu)\n",
-                        __entry->pid, __entry->job,
-                        __entry->exec_time)
+                        __entry->pid, __entry->job, __entry->exec_time)
 );
 
 /*
@@ -111,14 +110,13 @@ TRACE_EVENT(litmus_switch_away,
         ),
 
         TP_fast_assign(
-                       __entry->pid     = t->pid;//is_realtime(t) ? t->pid : 0;
-                       __entry->job     = t->rt_param.job_params.job_no;//is_realtime(t) ? t->rt_param.job_params.job_no : 0;
+                __entry->pid    = is_realtime(t) ? t->pid : 0;
+                __entry->job    = is_realtime(t) ? t->rt_param.job_params.job_no : 0;
                 __entry->exec_time      = get_exec_time(t);
         ),
 
         TP_printk("switch_away(job(%u, %u)): (exec: %Lu)\n",
-                        __entry->pid, __entry->job,
-                        __entry->exec_time)
+                        __entry->pid, __entry->job, __entry->exec_time)
 );
 
 /*
@@ -143,8 +141,7 @@ TRACE_EVENT(litmus_task_completion,
         ),
 
         TP_printk("completed(job(%u, %u)): (forced: %lu)\n",
-                        __entry->pid, __entry->job,
-                        __entry->forced)
+                        __entry->pid, __entry->job, __entry->forced)
 );
 
 /*
@@ -166,8 +163,7 @@ TRACE_EVENT(litmus_task_block,
                 __entry->lid    = lid;
         ),
 
-        TP_printk("(%u) blocks on %d\n", __entry->pid,
-                  __entry->lid)
+        TP_printk("(%u) blocks on %d\n", __entry->pid, __entry->lid)
 );
 
 /*
@@ -189,8 +185,7 @@ TRACE_EVENT(litmus_resource_acquire,
                 __entry->lid    = lid;
         ),
 
-        TP_printk("(%u) acquires %d\n", __entry->pid,
-                  __entry->lid)
+        TP_printk("(%u) acquires %d\n", __entry->pid, __entry->lid)
 );
 
 TRACE_EVENT(litmus_resource_release,
@@ -215,26 +210,26 @@ TRACE_EVENT(litmus_resource_release,
 
 TRACE_EVENT(litmus_priority_donate,
 
-            TP_PROTO(struct task_struct *t, struct task_struct *donor, int lid),
+        TP_PROTO(struct task_struct *t, struct task_struct *donor, int lid),
 
-            TP_ARGS(t, donor, lid),
+        TP_ARGS(t, donor, lid),
 
-            TP_STRUCT__entry(
-                             __field( pid_t, t_pid )
-                             __field( pid_t, d_pid )
-                             __field( unsigned long long, prio)
-                             __field( int,   lid   )
-                             ),
+        TP_STRUCT__entry(
+                __field( pid_t, t_pid )
+                __field( pid_t, d_pid )
+                __field( unsigned long long, prio)
+                __field( int,   lid   )
+        ),
 
-            TP_fast_assign(
-                           __entry->t_pid = t ? t->pid : 0;
-                           __entry->d_pid = donor ? donor->pid : 0;
-                           __entry->prio = get_deadline(donor);
-                           __entry->lid = lid;
-                           ),
+        TP_fast_assign(
+                __entry->t_pid = t ? t->pid : 0;
+                __entry->d_pid = donor ? donor->pid : 0;
+                __entry->prio = get_deadline(donor);
+                __entry->lid = lid;
+        ),
 
-            TP_printk("(%u) inherits %llu from (%u) on %d\n", __entry->t_pid,
-                      __entry->d_pid, __entry->prio, __entry->lid)
+        TP_printk("(%u) inherits %llu from (%u) on %d\n", __entry->t_pid,
+                  __entry->d_pid, __entry->prio, __entry->lid)
 );
 
 /*
@@ -259,8 +254,7 @@ TRACE_EVENT(litmus_task_resume,
         ),
 
         TP_printk("resume(job(%u, %u)) on %d\n",
-                  __entry->pid, __entry->job,
-                  __entry->lid)
+                  __entry->pid, __entry->job, __entry->lid)
 );
 
 /*
@@ -284,7 +278,6 @@ TRACE_EVENT(litmus_sys_release,
 );
 
 /*
-=======
  * Trace task exit
  */
 TRACE_EVENT(litmus_task_exit,
@@ -300,9 +293,7 @@ TRACE_EVENT(litmus_task_exit,
 
         TP_fast_assign(
                 __entry->pid = t ? t->pid : 0;
-#ifdef CONFIG_PLUGIN_COLOR
                 __entry->max_exec_time = t ? t->rt_param.max_exec_time : 0;
-#endif
         ),
 
         TP_printk("(%u) exit\n", __entry->pid)
@@ -356,10 +347,9 @@ TRACE_EVENT(litmus_server_param,
 
 TRACE_EVENT(litmus_server_switch_to,
 
-            TP_PROTO(int sid, unsigned int job, int tid, unsigned int tjob),
-
-            TP_ARGS(sid, job, tid, tjob),
+        TP_PROTO(int sid, unsigned int job, int tid, unsigned int tjob),
 
+        TP_ARGS(sid, job, tid, tjob),
 
         TP_STRUCT__entry(
                 __field( int, sid)
@@ -375,14 +365,15 @@ TRACE_EVENT(litmus_server_switch_to,
                 __entry->tjob = tjob;
         ),
 
-            TP_printk("switch_to(server(%d, %u)): (%d, %d)\n", __entry->sid, __entry->job, __entry->tid, __entry->tjob)
+        TP_printk("switch_to(server(%d, %u)): (%d, %d)\n",
+                  __entry->sid, __entry->job, __entry->tid, __entry->tjob)
 );
 
 TRACE_EVENT(litmus_server_switch_away,
 
-            TP_PROTO(int sid, unsigned int job, int tid, unsigned int tjob),
+        TP_PROTO(int sid, unsigned int job, int tid, unsigned int tjob),
 
-            TP_ARGS(sid, job, tid, tjob),
+        TP_ARGS(sid, job, tid, tjob),
 
         TP_STRUCT__entry(
                 __field( int, sid)
@@ -398,7 +389,8 @@ TRACE_EVENT(litmus_server_switch_away,
                 __entry->tjob = tjob;
         ),
 
-            TP_printk("switch_away(server(%d, %u)): (%d, %d)\n", __entry->sid, __entry->job, __entry->tid, __entry->tjob)
+        TP_printk("switch_away(server(%d, %u)): (%d, %d)\n",
+                  __entry->sid, __entry->job, __entry->tid, __entry->tjob)
 );
 
 TRACE_EVENT(litmus_server_release,