Merge branch 'gh/prop/completion-fix' into wip-2012.3-gpu-rtss13

Conflicts:
	include/litmus/budget.h
	litmus/sched_cedf.c
	litmus/sync.c

4 files changed, 18 insertions, 12 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 332606c46e56..7efd146c2198 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -143,7 +143,7 @@ clear_bit(flag_nr, &tsk_rt(t)->budget.flags))
 tsk_rt(t)->budget.flags = 0)
 
 #define requeue_preempted_job(t) \
-(t && (!budget_exhausted(t) || !budget_enforced(t)))
+(t && !is_completed(t) && (!budget_exhausted(t) || !budget_enforced(t)))
 
 
 #ifdef CONFIG_LITMUS_LOCKING
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 09caa509a0f4..7d5ca1c49ab8 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -380,7 +380,6 @@ static noinline void link_task_to_cpu(struct task_struct* linked,
 
         /* Link new task to CPU. */
         if (linked) {
-                tsk_rt(linked)->completed = 0;
                 /* handle task is already scheduled somewhere! */
                 on_cpu = linked->rt_param.scheduled_on;
                 if (on_cpu != NO_CPU) {
@@ -618,7 +617,7 @@ static noinline void job_completion(struct task_struct *t, int forced)
                            now, forced);
 
         /* set flags */
-        tsk_rt(t)->completed = 1;
+        tsk_rt(t)->completed = 0;
 
         if (!forced && do_backlogged_job) {
                 /* Don't advance deadline/refresh budget. Use the remaining budget for
@@ -647,7 +646,6 @@ static noinline void job_completion(struct task_struct *t, int forced)
         unlink(t);
 
         /* release or arm next job */
-        tsk_rt(t)->completed = 0;
         if (is_running(t)) {
                 /* is our next job a backlogged job? */
                 if (do_backlogged_job) {
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index cad6210d844d..0f96fb7ddb25 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -224,7 +224,6 @@ static noinline void link_task_to_cpu(struct task_struct* linked,
 
         /* Link new task to CPU. */
         if (linked) {
-                tsk_rt(linked)->completed = 0;
                 /* handle task is already scheduled somewhere! */
                 on_cpu = linked->rt_param.scheduled_on;
                 if (on_cpu != NO_CPU) {
@@ -408,7 +407,7 @@ static noinline void job_completion(struct task_struct *t, int forced)
         TRACE_TASK(t, "job_completion().\n");
 
         /* set flags */
-        tsk_rt(t)->completed = 1;
+        tsk_rt(t)->completed = 0;
         /* prepare for next period */
         prepare_for_next_period(t);
         if (is_early_releasing(t) || is_released(t, litmus_clock()))
diff --git a/litmus/sync.c b/litmus/sync.c
index 01ea5d52f84b..93b7207b9361 100644
--- a/litmus/sync.c
+++ b/litmus/sync.c
@@ -55,14 +55,23 @@ static long do_wait_for_ts_release(struct timespec *wake)
                                         + current->rt_param.task_params.phase;
                         *wake = ns_to_timespec(phasedRelease);
 
-                        /* Completion succeeded, setup release. */
-                        litmus->release_at(current, phasedRelease
-                                                        - current->rt_param.task_params.period);
-                        /* trigger advance to next job release at the programmed time */
-                        ret = complete_job();
+                        /* Setting this flag before releasing ensures that this CPU
+                         * will be the next CPU to requeue the task on a ready or
+                         * release queue.
+                         */
+                        tsk_rt(current)->completed = 1;
+                        mb();
+
+                        /* completion succeeded, set up release. subtract off
+                         * period because schedule()->job_completion() will
+                         * advances us to the correct time */
+                        litmus->release_at(current,
+                                phasedRelease - current->rt_param.task_params.period);
+                        schedule();
                 }
-                else
+                else {
                         *wake = ns_to_timespec(wait.ts_release_time);
+                }
         } else {
                 /* We were interrupted, must cleanup list. */
                 mutex_lock(&task_release_lock);