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, 43 insertions, 16 deletions

diff --git a/litmus/jobs.c b/litmus/jobs.c
index bd3175baefae..983b084cf32b 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -1,4 +1,5 @@
 /* litmus/jobs.c - common job control code
+ * TODO: modified heavily for sched_mc
  */
 
 #include <linux/sched.h>
@@ -6,25 +7,23 @@
 #include <litmus/litmus.h>
 #include <litmus/jobs.h>
 #include <litmus/trace.h>
+#include <litmus/sched_trace.h>
+#include <litmus/domain.h>
+#include <litmus/sched_mc.h>
 
-static inline void setup_release(struct task_struct *t, lt_t release)
+static inline void setup_release(struct task_struct *t, struct rt_job *job,
+                                 lt_t release)
 {
         /* prepare next release */
-        tsk_rt(t)->job_params.release   = release;
-        tsk_rt(t)->job_params.deadline  = release + get_rt_relative_deadline(t);
-        tsk_rt(t)->job_params.exec_time = 0;
+        job->release   = release;
+        job->deadline  = release + get_rt_relative_deadline(t);
+        job->exec_time = 0;
 
         /* update job sequence number */
-        tsk_rt(t)->job_params.job_no++;
-
-        /* don't confuse Linux */
-        t->rt.time_slice = 1;
-
-        TRACE_TASK(t, "Releasing at %llu, deadline: %llu, period: %llu, now: %llu\n",
-                   release, get_deadline(t), get_rt_period(t), litmus_clock());
+        ++job->job_no;
 }
 
-void prepare_for_next_period(struct task_struct *t)
+static inline void setup_kernel_release(struct task_struct *t, lt_t release)
 {
         BUG_ON(!t);
 
@@ -32,21 +31,49 @@ void prepare_for_next_period(struct task_struct *t)
          * release and deadline. Lateness may be negative.
          */
         t->rt_param.job_params.lateness =
-                (long long)litmus_clock() - 
+                (long long)litmus_clock() -
                 (long long)t->rt_param.job_params.deadline;
 
-        setup_release(t, get_release(t) + get_rt_period(t));
+        t->rt.time_slice = 1;
+
+        setup_release(t, &tsk_rt(t)->job_params, release);
+
+        TRACE_MC_TASK(t, "kernel rel=%llu, dead=%llu\n", get_release(t), get_deadline(t));
+
+        sched_trace_server_release(-t->pid, get_rt_job(t),
+                                   tsk_rt(t)->job_params);
+}
+
+void setup_user_release(struct task_struct *t, lt_t release)
+{
+        setup_release(t, &tsk_rt(t)->user_job, release);
+        TRACE_MC_TASK(t, "user rel=%llu, dead=%llu\n", get_user_release(t), get_user_deadline(t));
+        if (CRIT_LEVEL_A != tsk_mc_crit(t))
+                sched_trace_task_release(t);
+
+}
+
+void prepare_for_next_period(struct task_struct *t)
+{
+        setup_kernel_release(t, get_release(t) + get_rt_period(t));
 }
 
 void release_at(struct task_struct *t, lt_t start)
 {
         BUG_ON(!t);
-        setup_release(t, start);
+
+        TRACE_MC_TASK(t, "Releasing at %llu\n", start);
+
+        setup_kernel_release(t, start);
+        setup_user_release(t, start);
+
+        BUG_ON(!is_released(t, start));
+
         set_rt_flags(t, RT_F_RUNNING);
 }
 
 /*
- * Deactivate current task until the beginning of the next period.
+ * User-space job has completed execution
  */
 long complete_job(void)
 {