Merge branch 'wip-color' into wip-mc

Conflicts:
	include/litmus/budget.h
	include/litmus/litmus.h
	include/litmus/rt_param.h
	include/litmus/sched_trace.h
	include/litmus/trace.h
	include/trace/events/litmus.h
	litmus/Makefile
	litmus/budget.c
	litmus/ftdev.c
	litmus/jobs.c
	litmus/litmus.c
	litmus/locking.c
	litmus/preempt.c
	litmus/rt_domain.c
	litmus/sched_gsn_edf.c
	litmus/trace.c

1 files changed, 9 insertions, 3 deletions

diff --git a/litmus/jobs.c b/litmus/jobs.c
index 10a42db1165..7263cabf8c6 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -9,15 +9,21 @@
 void prepare_for_next_period(struct task_struct *t)
 {
         BUG_ON(!t);
+#ifdef CONFIG_PLUGIN_COLOR
+        tsk_rt(t)->tot_exec_time += tsk_rt(t)->job_params.exec_time;
+#endif
         /* prepare next release */
-
         t->rt_param.job_params.release   = t->rt_param.job_params.deadline;
         t->rt_param.job_params.real_release =  t->rt_param.job_params.release;
         t->rt_param.job_params.deadline += get_rt_period(t);
         t->rt_param.job_params.real_deadline = t->rt_param.job_params.deadline;
         t->rt_param.job_params.exec_time = 0;
+        tsk_rt(t)->job_params.release   = tsk_rt(t)->job_params.deadline;
+        tsk_rt(t)->job_params.deadline += get_rt_period(t);
+        tsk_rt(t)->job_params.exec_time = 0;
+
         /* update job sequence number */
-        t->rt_param.job_params.job_no++;
+        tsk_rt(t)->job_params.job_no++;
 
         /* don't confuse Linux */
         t->rt.time_slice = 1;
@@ -25,7 +31,7 @@ void prepare_for_next_period(struct task_struct *t)
 
 void release_at(struct task_struct *t, lt_t start)
 {
-        t->rt_param.job_params.deadline = start;
+        tsk_rt(t)->job_params.deadline = start;
         prepare_for_next_period(t);
         set_rt_flags(t, RT_F_RUNNING);
 }