Moved user-space state of tasks into new rt_param.user_job.

Both sched_color and sched_mc assumed seperate kernel and userspace views of job
states, where the kernel view is used for scheduling while the userspace view
is used for statistics (tardiness etc). This commit merges both approaches.

1 files changed, 8 insertions, 8 deletions

diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index 474aa129c233..58ffdcd4c546 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -29,7 +29,7 @@ TRACE_EVENT(litmus_task_param,
 
         TP_fast_assign(
                 __entry->pid    = t ? t->pid : 0;
-                __entry->job    = t ? t->rt_param.job_params.job_no : 0;
+                __entry->job    = t ? get_user_job(t) : 0,
                 __entry->wcet   = get_exec_cost(t);
                 __entry->period = get_rt_period(t);
                 __entry->phase  = get_rt_phase(t);
@@ -59,9 +59,9 @@ TRACE_EVENT(litmus_task_release,
 
         TP_fast_assign(
                 __entry->pid    = t ? t->pid : 0;
-                __entry->job    = t ? t->rt_param.job_params.job_no : 0;
-                __entry->release        = get_release(t);
-                __entry->deadline       = get_deadline(t);
+                __entry->job    = t ? get_user_job(t) : 0;
+                __entry->release        = get_user_release(t);
+                __entry->deadline       = get_user_deadline(t);
         ),
 
         TP_printk("release(job(%u, %u)): %Lu\ndeadline(job(%u, %u)): %Lu\n",
@@ -86,7 +86,7 @@ TRACE_EVENT(litmus_switch_to,
 
         TP_fast_assign(
                 __entry->pid    = is_realtime(t) ? t->pid : 0;
-                __entry->job    = is_realtime(t) ? t->rt_param.job_params.job_no : 0;
+                __entry->job    = is_realtime(t) ? get_user_job(t) : 0;
                 __entry->exec_time      = get_exec_time(t);
         ),
 
@@ -111,7 +111,7 @@ TRACE_EVENT(litmus_switch_away,
 
         TP_fast_assign(
                 __entry->pid    = is_realtime(t) ? t->pid : 0;
-                __entry->job    = is_realtime(t) ? t->rt_param.job_params.job_no : 0;
+                __entry->job    = is_realtime(t) ? get_user_job(t) : 0;
                 __entry->exec_time      = get_exec_time(t);
         ),
 
@@ -136,7 +136,7 @@ TRACE_EVENT(litmus_task_completion,
 
         TP_fast_assign(
                 __entry->pid    = t ? t->pid : 0;
-                __entry->job    = t ? t->rt_param.job_params.job_no : 0;
+                __entry->job    = t ? get_user_job(t) : 0;
                 __entry->forced = forced;
         ),
 
@@ -249,7 +249,7 @@ TRACE_EVENT(litmus_task_resume,
 
         TP_fast_assign(
                 __entry->pid    = t ? t->pid : 0;
-                __entry->job    = t ? t->rt_param.job_params.job_no : 0;
+                __entry->job    = t ? get_user_job(t) : 0;
                 __entry->lid    = lid;
         ),