SOBLIV draining support for C-EDF.wip-2012.3-gpu

Adds support for suspension-oblivous budget draining
to C-EDF. Also changes how jobs with exhausted budget
in C-EDF are treated: jobs are early released until
they catch up.

1 files changed, 9 insertions, 4 deletions

diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 3b3edfe908ff..c06db8b434cd 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -164,7 +164,7 @@ static void job_completion(struct task_struct* t, int forced)
         prepare_for_next_period(t);
 }
 
-static void psnedf_simple_on_exhausted(struct task_struct *t)
+static enum hrtimer_restart psnedf_simple_on_exhausted(struct task_struct *t)
 {
         /* Assumption: t is scheduled on the CPU executing this callback */
 
@@ -189,6 +189,8 @@ static void psnedf_simple_on_exhausted(struct task_struct *t)
                         request_exit_np(t);
                 }
         }
+
+        return HRTIMER_NORESTART;
 }
 
 static void psnedf_tick(struct task_struct *t)
@@ -246,8 +248,10 @@ static struct task_struct* psnedf_schedule(struct task_struct * prev)
         if (tsk_rt(prev)->budget.ops) {
                 if (blocks)
                         tsk_rt(prev)->budget.ops->on_blocked(prev);
-                else if (preempt || sleep)
-                        tsk_rt(prev)->budget.ops->on_preempt_or_sleep(prev);
+                else if (sleep)
+                        tsk_rt(prev)->budget.ops->on_sleep(prev);
+                else if (preempt)
+                        tsk_rt(prev)->budget.ops->on_preempt(prev);
         }
 
         /* If a task blocks we have no choice but to reschedule.
@@ -647,7 +651,8 @@ static struct budget_tracker_ops psnedf_drain_simple_ops =
 {
         .on_scheduled = simple_on_scheduled,
         .on_blocked = simple_on_blocked,
-        .on_preempt_or_sleep = simple_on_preempt_or_sleep,
+        .on_preempt = simple_on_preempt,
+        .on_sleep = simple_on_sleep,
         .on_exit = simple_on_exit,
 
         .on_exhausted = psnedf_simple_on_exhausted,