Merge branch 'edfsc-wip' of rtsrv.cs.unc.edu:/public/litmus-rt-edfsc into edfsc-wip

1 files changed, 8 insertions, 10 deletions

diff --git a/litmus/sched_edfsc.c b/litmus/sched_edfsc.c
index a787fd5a040d..218123d99514 100644
--- a/litmus/sched_edfsc.c
+++ b/litmus/sched_edfsc.c
@@ -544,10 +544,13 @@ static int fifo_prio(struct bheap_node* _a, struct bheap_node* _b)
         return 0;
 }
 
-// takes in the container_domain pointer in container task_struct
-// assuming prev is previous task running on the processor before calling schedule
-// global lock in effect
-// returns container if no fixed task is next
+/**
+ * Schedule inside of a container domain
+ * Called with g_lock already held
+ * @param cedf Pointer to tsk_rt(container)->edfsc_params->domain
+ * @param prev Previous task running on this processor before schedule was called
+ * @returns `cedf->container` if no fixed task is next
+ */
 static struct task_struct* edfsc_cschedule(cont_domain_t* cedf, struct task_struct * prev)
 {
         rt_domain_t *edf = &cedf->domain;
@@ -797,15 +800,9 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
                         TRACE_TASK(entry->scheduled, "scheduled_on = NO_CPU\n");
                 }
         } 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, prev);
-                if (exists && is_container(next))
-                        next = prev;
         }
 
         sched_state_task_picked();
@@ -821,6 +818,7 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
                 TRACE("becomes idle at %llu.\n", litmus_clock());
 #endif
 
+        // If next is a container, then edfsc_cschedule() found nothing to schedule
         if (is_container(next)) {
                 manage_idle_enforcement_timer(next);
                 return NULL;