Latest Commitedfsc-wip

1 files changed, 25 insertions, 16 deletions

diff --git a/litmus/sched_edfsc.c b/litmus/sched_edfsc.c
index 501aa1197a94..927f35ebc68f 100644
--- a/litmus/sched_edfsc.c
+++ b/litmus/sched_edfsc.c
@@ -645,8 +645,10 @@ static void edfsc_cschedule(cont_domain_t* cedf, struct task_struct * prev)
          * this.
          */
         if (!np && (out_of_time || sleep)) {
-                if (is_fixed(cedf->scheduled))
+                if (is_fixed(cedf->scheduled)) {
+                        printk("fixed task complete\n");
                         c_job_completion(cedf->scheduled, !sleep);
+                }
                 else {
                         g_job_completion(cedf->scheduled, !sleep);
                 }
@@ -786,6 +788,7 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
         // Determine what to run next (set entry->linked)
         if (!entry->linked) {
                 struct task_struct* task = __take_ready(&gsched_domain);
+                //printk("next task: %d\n", task);
                 // Make sure that containers are only scheduled on cores with same id
                 if (is_container(task) && entry->cpu != tsk_rt(task)->edfsc_params.id) {
                         // Get cpu_entry for task's core assignment
@@ -798,21 +801,24 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
                         link_task_to_cpu(target->linked, entry);
                         // Setup the container to run next on the remote core
                         link_task_to_cpu(task, target);
+                        BUG_ON(budget_exhausted(task));
                         // Alert the remote core that it now needs to reschedule
                         preempt(target);
                 } else {
                         // We'll now schedule the ready task here
                         link_task_to_cpu(task, entry);
+                        BUG_ON(task && budget_exhausted(task));
                         // Give up on this scheduling cycle, as we need to re-check the
                         // conditions earlier on in edfsc_gschedule()
-                        if (task)
-                                preempt(entry);
+                        //if (task)
+                        //      preempt(entry);
                 }
+                //printk("next linked: %d\n", entry->linked);
                 // We need to restart the scheduling process to make sure that linked
                 // is not out of budget OR we have nothing to run anyway
-                goto out;
+                //XXX modify this into a while loop?
+                //goto out;
         }
-
         BUG_ON(entry->linked && budget_exhausted(entry->linked));
         BUG_ON(!bheap_node_in_heap(entry->hn) && entry->linked && tsk_rt(entry->linked)->edfsc_params.id != entry->cpu);
         BUG_ON(is_container(entry->linked) && tsk_rt(entry->linked)->edfsc_params.id != entry->cpu);
@@ -844,8 +850,8 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
         if (is_container(next))
                 edfsc_cschedule(tsk_rt(next)->edfsc_params.domain, prev);
 
-out:
-        sched_state_task_picked();
+//out:
+//      sched_state_task_picked();
 
         // if no fixed tasks to be scheduled by the container, then container->scheduled
         // should be the previous non-rt task if any
@@ -865,7 +871,6 @@ out:
         else if (exists && !next)
                 TRACE("becomes idle at %llu.\n", litmus_clock());
 #endif
-
         return next;
 }
 
@@ -888,7 +893,8 @@ static enum hrtimer_restart container_boundary(struct hrtimer *timer)
 
         raw_spin_lock_irqsave(&g_lock, flags);
 
-        printk("\ncontainer_boundary\n");
+        //printk("\ncontainer_boundary\n");
+        TRACE("container_boundary start\n", litmus_clock());
 
         now = litmus_clock();
 
@@ -908,14 +914,15 @@ static enum hrtimer_restart container_boundary(struct hrtimer *timer)
                 u_extra = to_fp(num_cpus) - sys_util;
                 container = NULL;
                 t = task_of_list_node(it);
-                printk("sys_util: %d\n", sys_util);
-                printk("task util: %d\n", get_rt_utilization(t));
+                //printk("sys_util: %d\n", sys_util);
+                //printk("task util: %d\n", get_rt_utilization(t));
                 if (u_extra >= get_rt_utilization(t)) {
                         for (i = 0; i < num_cpus; i++) {
                                 u64 leftover = to_fp(1) - container_domains[i].f_util;
-                                printk("container: %d\n", container_domains[i].f_util);
+                                //printk("container: %d\n", container_domains[i].f_util);
                                 if (leftover >= get_rt_utilization(t)) {
                                         container = &(container_domains[i]);
+                                        printk("container id: %d\n", i);
                                         break;
                                 }
                         }
@@ -1026,8 +1033,8 @@ static enum hrtimer_restart container_boundary(struct hrtimer *timer)
         for (i = 0; i < num_cpus; i++) {
                 // will first iterate through fully provisioned containers, then not fully provisioned ones
                 struct task_struct* t = container_list[i]->container;
-                printk("container id: %d\n", tsk_rt(t)->edfsc_params.id);
-                printk("container budget: %lld\n", budget_remaining(t));
+                //printk("container id: %d\n", tsk_rt(t)->edfsc_params.id);
+                //printk("container budget: %lld\n", budget_remaining(t));
                 // If the last job completed on time, release it now
                 if (budget_exhausted(t)) {
                         BUG_ON(is_queued(t));
@@ -1039,7 +1046,7 @@ static enum hrtimer_restart container_boundary(struct hrtimer *timer)
                 }
         }
 
-        printk("/container_boundary\n\n");
+        //printk("/container_boundary\n\n");
         raw_spin_unlock_irqrestore(&g_lock, flags);
 
         hrtimer_add_expires_ns(timer, LITMUS_QUANTUM_LENGTH_NS);
@@ -1090,6 +1097,7 @@ static void edfsc_task_new(struct task_struct* t, int on_rq, int is_scheduled)
 
         raw_spin_lock_irqsave(&g_lock, flags);
         // Queue this task and request a reschedule
+        printk("requeue task\n");
         requeue(t);
         preempt(entry);
 
@@ -1128,7 +1136,8 @@ static void edfsc_task_exit(struct task_struct* t)
         raw_spin_lock_irqsave(&g_lock, flags);
 
         // Remove this task from all members of its scheduling domain
-        unlink(t);
+        if (is_migrating(t))
+                unlink(t);
         if (is_queued(t)) {
                 remove(tsk_rt(t)->domain, t);
         } else if (is_fixed(t)) {