Cleanup, no functional changes

1 files changed, 7 insertions, 16 deletions

diff --git a/litmus/sched_edfsc.c b/litmus/sched_edfsc.c
index 9dd30eb60599..5711a09a6c36 100644
--- a/litmus/sched_edfsc.c
+++ b/litmus/sched_edfsc.c
@@ -460,10 +460,7 @@ static noinline void g_job_completion(struct task_struct* t, int forced)
 
         TRACE_TASK(t, "job_completion(forced=%d).\n", forced);
 
-        /* set flags */
         tsk_rt(t)->completed = 0;
-
-        /* unlink */
         unlink(t);
 
         // When migrating is being removed, or turned into a fixed task
@@ -491,6 +488,8 @@ static noinline void g_job_completion(struct task_struct* t, int forced)
                         g_preempt_check();
                 }
         // When a container job finishes late
+        // XXX: This implementation has diverged from that in container_boundary, the
+        //      new code needs to be translated into this block as well or unified.
         } else if (is_container(t) && tsk_rt(t)->edfsc_params.can_release) {
                 cpu_entry_t* entry = &per_cpu(edfsc_cpu_entries, tsk_rt(t)->edfsc_params.id);
                 tsk_rt(t)->edfsc_params.can_release = 0;
@@ -550,7 +549,6 @@ static void g_finish_switch(struct task_struct *prev)
         cpu_entry_t* entry = this_cpu_ptr(&edfsc_cpu_entries);
         struct task_struct* container = &container_tasks[entry->cpu];
         BUG_ON(is_realtime(current) && tsk_rt(current)->domain == NULL);
-        //BUG_ON(tsk_rt(container)->scheduled_on != smp_processor_id());
 
         entry->scheduled = is_realtime(current) ? current : NULL;
         // If we're scheduling a task in a container, set entry->scheduled to the container
@@ -1135,7 +1133,6 @@ static void edfsc_task_exit(struct task_struct* t)
         lt_t now, unaccount_time = 0;
         cpu_entry_t* entry;
 
-
         BUG_ON(is_container(t));
         raw_spin_lock_irqsave(&g_lock, flags);
         // XXX: Superfluous. We never see `t` as one of our tasks again.
@@ -1161,7 +1158,7 @@ static void edfsc_task_exit(struct task_struct* t)
         }
 
         /* To preserve EDF-sc scheduling invariants, we can only release a task's
-         * utilization at the greater of the period or deadline boundry. Thus, here
+         * utilization at the greater of completion or deadline boundary. Thus, here
          * we schedule a timer to handle this unaccounting of utilization.
          */
         now = litmus_clock();
@@ -1233,9 +1230,6 @@ static void edfsc_setup_domain_proc(void)
 
 static long edfsc_activate_plugin(void)
 {
-        lt_t now;
-        int i;
-        now = litmus_clock();
         /* TODO This will need to:
          * - Initialize the containers and container tasks
          *   (or can that be done at least partially in the module init function?
@@ -1243,12 +1237,10 @@ static long edfsc_activate_plugin(void)
          *   be reusable if we don't destroy them when the plugin is deactivated)
          * - ...
          */
-        for (i = 0; i < num_online_cpus(); i++)
-                requeue(&container_tasks[i]);
 
         // Start the container boundary timer
         hrtimer_start(&container_release_timer,
-                        ns_to_ktime(now + LITMUS_QUANTUM_LENGTH_NS),
+                        ns_to_ktime(litmus_clock() + LITMUS_QUANTUM_LENGTH_NS),
                         HRTIMER_MODE_ABS_PINNED);
 
         edfsc_setup_domain_proc();
@@ -1258,9 +1250,8 @@ static long edfsc_activate_plugin(void)
 
 static long edfsc_deactivate_plugin(void)
 {
-        /* TODO This will need to:
-         * - ...
-         */
+        // TODO: Reset our internal state
+
         // Stop the container boundary timer
         hrtimer_cancel(&container_release_timer);
 
@@ -1329,7 +1320,6 @@ static int __init init_edfsc(void)
 
         INIT_LIST_HEAD(&pending_adds);
         INIT_LIST_HEAD(&migrating_tasks);
-        // TODO
 
         bheap_init(&edfsc_cpu_heap);
 
@@ -1381,6 +1371,7 @@ static int __init init_edfsc(void)
                 }
 
                 container_tasks[i].policy = SCHED_LITMUS;
+                requeue(&container_tasks[i]);
 
                 // Populate the container_list while we're at it.
                 container_list[i] = &container_domains[i];