Fix logic in gschedule and cschedule when prev is non-realtime

1 files changed, 11 insertions, 9 deletions

diff --git a/litmus/sched_edfsc.c b/litmus/sched_edfsc.c
index 01a13f6a85c1..ab143d9a15f8 100644
--- a/litmus/sched_edfsc.c
+++ b/litmus/sched_edfsc.c
@@ -484,10 +484,10 @@ static struct task_struct* edfsc_cschedule(cont_domain_t* cedf, struct task_stru
          * differently from gedf, when a task exits (dead)

          * cedf->schedule may be null and prev _is_ realtime

          */

-        printk("%p\n", cedf->scheduled);

-        BUG_ON(cedf->scheduled && cedf->scheduled != prev);

-        BUG_ON(cedf->scheduled && !is_realtime(prev));

-        BUG_ON(is_migrating(cedf->scheduled));

+        ////printk("%p\n", cedf->scheduled);

+        BUG_ON(cedf->scheduled && cedf->scheduled != prev && is_realtime(prev));

+        // XXX: Is this okay with background scheduling???

+        BUG_ON(cedf->scheduled && is_migrating(cedf->scheduled));

 

         /* (0) Determine state */

         exists      = cedf->scheduled != NULL;

@@ -496,7 +496,7 @@ static struct task_struct* edfsc_cschedule(cont_domain_t* cedf, struct task_stru
                              && budget_exhausted(cedf->scheduled);

         np          = exists && is_np(cedf->scheduled);

         sleep       = exists && is_completed(cedf->scheduled);

-        preempt     = is_migrating(prev) || edf_preemption_needed(edf, prev);

+        preempt     = !is_realtime(prev) || is_migrating(prev) || edf_preemption_needed(edf, prev);

 

         /* If we need to preempt do so.

          * The following checks set resched to 1 in case of special

@@ -726,6 +726,8 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
                 if (entry->linked) {

                         entry->linked->rt_param.scheduled_on = entry->cpu;

                         next = entry->linked;

+                        if (is_container(next))

+                                next = edfsc_cschedule(tsk_rt(next)->edfsc_params.domain, prev);

                         TRACE_TASK(next, "scheduled_on = P%d\n", smp_processor_id());

                 }

                 if (entry->scheduled) {

@@ -733,18 +735,17 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
                         entry->scheduled->rt_param.scheduled_on = NO_CPU;

                         TRACE_TASK(entry->scheduled, "scheduled_on = NO_CPU\n");

                 }

-        if (is_container(entry->scheduled))

-            next = edfsc_cschedule(tsk_rt(next)->edfsc_params.domain, prev);

-        } else

+        } else {

         // When a fixed task is released, it causes gschedule to be called

         // however, when entry->scheduled is a previously empty container,

         // prev can be a non-rt task. In which case, we can only set next = prev

         // when cschedule finds nothing to schedule on the container

         BUG_ON(entry->linked != entry->scheduled);

         if (is_container(entry->scheduled))

-            next = edfsc_cschedule(tsk_rt(entry->scheduled)->edfsc_params.domain, entry->scheduled);

+            next = edfsc_cschedule(tsk_rt(entry->scheduled)->edfsc_params.domain, prev);

                 if (exists && is_container(next))

             next = prev;

+        }

 

         sched_state_task_picked();

 

@@ -765,6 +766,7 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
         manage_idle_enforcement_timer(next);

         return NULL;

     }

+        // XXX: Maybe this should be entry->linked

     else if (next == prev && is_container(entry->scheduled)) {

         manage_idle_enforcement_timer(entry->scheduled);

         return next;