Various little clean-up operations

2 files changed, 47 insertions, 55 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 7baea47d831a..68c58c58190e 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -5,8 +5,6 @@
 #ifndef _LINUX_RT_PARAM_H_
 #define _LINUX_RT_PARAM_H_
 
-#include 
-
 /* Litmus time type. */
 typedef unsigned long long lt_t;
 
@@ -112,7 +110,7 @@ struct reservation_config {
         };
 };
 
-//struct for edfsc_parameters
+// struct for edfsc_parameters
 typedef struct {
         cont_domain_t* container_domain;
         struct task_struct* container_task;
diff --git a/litmus/sched_edfsc.c b/litmus/sched_edfsc.c
index 1f6e82a9b954..282ba18ad3f0 100644
--- a/litmus/sched_edfsc.c
+++ b/litmus/sched_edfsc.c
@@ -25,7 +25,6 @@ typedef struct {
         struct task_struct*     scheduled; //container or migrating task

         atomic_t                will_schedule;

         struct bheap_node*      hn;

-        int task_util, future_task_util;

 } cpu_entry_t;

 

 typedef struct {

@@ -33,10 +32,9 @@ typedef struct {
         struct task_struct* container;

         struct task_struct* scheduled; //fixed task

         lt_t scheduled_last_exec_time; //exec_time of the scheduled task when it was last scheduled

-        lt_t changed_budget; //change to scheduled task's exec time due to container budget constraints 

-        int task_util, future_task_util;

+        lt_t changed_budget; //change to scheduled task's exec time due to container budget constraints

+        u64 task_util, future_task_util;

         #define c_lock domain.ready_lock

-        

 } cont_domain_t;

 

 struct list_head pending_adds;

@@ -52,6 +50,8 @@ static cont_domaint_t container_domains[NR_CPUS];
 static rt_domain_t gsched_domain;

 #define g_lock (gsched_domain.ready_lock)

 

+u64 task_util, future_task_util;

+

 static u64 cont_job_id;

 

 #define is_container(task) task->container_domain == NULL

@@ -95,7 +95,7 @@ static noinline void requeue(struct task_struct* task, rt_domain_t* domain)
 

 static struct bheap_node edfsc_cpu_heap_node[NR_CPUS];

 static struct bheap      edfsc_cpu_heap;

- 

+

 static int cpu_lower_prio(struct bheap_node *_a, struct bheap_node *_b)

 {

         cpu_entry_t *a, *b;

@@ -211,7 +211,7 @@ static void g_preempt_check(void)
 {

         struct task_struct *task;

         cpu_entry_t *last;

-        

+

 #ifdef CONFIG_PREFER_LOCAL_LINKING

         cpu_entry_t *local;

 

@@ -247,13 +247,13 @@ static void g_preempt_check(void)
 static int c_preempt_check(container_domain_t* container)

 {

         if (edf_preemption_needed(&container->domain, container->scheduled)) {

-                preempt(pedf);

+                preempt(&container->domain);

                 return 1;

         } else

                 return 0;

 }

 

-//migrating or container task job_completion, called from edfsc_gschedule

+// migrating or container task job_completion, called from edfsc_gschedule

 static noinline void g_job_completion(struct task_struct* t, int forced)

 {

         BUG_ON(!t);

@@ -264,18 +264,12 @@ static noinline void g_job_completion(struct task_struct* t, int forced)
 

         /* set flags */

         tsk_rt(t)->completed = 0;

-        

-        //is at later of job completion and job deadline

-        if (is_migrating(t) && t->rt_param.job_params.lateness > 0 && tsk_rt(t)->edfsc_params.will_remove) {

-                //update task utilizations

-        }

-        

+

         if (is_migrating(t) && tsk_rt(t)->edfsc_params.will_remove) {

                 if (t->rt_param.job_params.lateness > 0) {

-                        //remove the task now

+                        // TODO remove the task now

                 }

-        }

-        else {          

+        } else {

                 /* prepare for next period */

                 prepare_for_next_period(t);

                 if (is_early_releasing(t) || is_released(t, litmus_clock()))

@@ -291,25 +285,24 @@ static noinline void g_job_completion(struct task_struct* t, int forced)
         }

 }

 

-//fixed task job_completion, called from edfsc_cschedule

+// fixed task job_completion, called from edfsc_cschedule

 static void c_job_completion(struct task_struct* t, int forced)

 {

         sched_trace_task_completion(t, forced);

         TRACE_TASK(t, "job_completion(forced=%d).\n", forced);

 

         tsk_rt(t)->completed = 0;

-        

+

         if (tsk_rt(t)->edfsc_params.will_remove) {

                 if (t->rt_param.job_params.lateness > 0) {

-                        //remove the task now

+                        // TODO remove the task now

                 }

-        }

-        else {

+        } else {

                 prepare_for_next_period(t);

         }

 }

 

-//need to update cpu entries after global scheduling

+// need to update cpu entries after global scheduling

 static void g_finish_switch(struct task_struct *prev)

 {

         cpu_entry_t*    entry = this_cpu_ptr(&gsnedf_cpu_entries);

@@ -321,12 +314,12 @@ static void g_finish_switch(struct task_struct *prev)
 #endif

 }

 

-//takes in the container_domain pointer in container task_struct

-//assuming prev is previous task running on the processor before calling schedule

+// takes in the container_domain pointer in container task_struct

+// assuming prev is previous task running on the processor before calling schedule

 static struct task_struct* edfsc_cschedule(cont_domain_t* cedf, struct task_struct * prev)

 {

         rt_domain_t* edf = cedf.domain;

-        

+

         struct task_struct*     next;

 

         int             out_of_time, sleep, preempt,

@@ -373,7 +366,7 @@ static struct task_struct* edfsc_cschedule(cont_domain_t* cedf, struct task_stru
          * this.

          */

         if (!np && (out_of_time || sleep)) {

-                job_completion(cedf->scheduled, !sleep);

+                c_job_completion(cedf->scheduled, !sleep);

                 resched = 1;

         }

 

@@ -424,14 +417,15 @@ static struct task_struct* edfsc_gschedule(struct task_struct * prev)
         BUG_ON(entry->scheduled && entry->scheduled != prev && entry->scheduled->container_domain != NULL);

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

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

-        

-        if (prev && is_fixed(prev)) { //update container budget if fixed task

+

+    // update container budget if fixed task

+        if (prev && is_fixed(prev)) {

                 cont_domain_t* cdomain = tsk_rt(prev->container_task)->edfsc_params.container_domain;

                 prev->job_params.exec_time -= cdomain->changed_budget;

-                tsk_rt(prev->edfsc_params)->container_task->job_params.exec_time += 

+                tsk_rt(prev->edfsc_params)->container_task->job_params.exec_time +=

                         prev->job_params.exec_time - cdomain->scheduled_last_exec_time;

         }

-        

+

         /* (0) Determine state */

         exists      = entry->scheduled != NULL;

         is_cont         = exists && entry->scheduled->container_domain == NULL;

@@ -452,10 +446,10 @@ static struct task_struct* edfsc_gschedule(struct task_struct * prev)
                            "state:%d sig:%d is_cont:%d\n",

                            blocks, out_of_time, np, sleep, preempt,

                            prev->state, signal_pending(prev), is_cont);

-                           

+

         if (is_cont && !sleep && !preempt && !out_of_time)

                 return edfsc_cschedule(tsk_rt(entry->scheduled)->edfsc_params.container_domain, prev);

-                           

+

         if (entry->linked && preempt)

                 TRACE_TASK(prev, "will be preempted by %s/%d\n",

                            entry->linked->comm, entry->linked->pid);

@@ -529,48 +523,49 @@ static struct task_struct* edfsc_gschedule(struct task_struct * prev)
         return next;

 }

 

-static void edfsc_task_new(struct task_struct* t, int on_rq, int is_scheduled) {

-        

+static void edfsc_task_new(struct task_struct* t, int on_rq, int is_scheduled)

+{

         unsigned long flags;

         cpu_entry_t* entry;

-        

+

         raw_spin_lock_irqsave(&g_lock, flags);

-        

+

         tsk_rt(t)->edfsc_params.will_remove = 0;

         tsk_rt(t).sporadic_release = 0;

         hrtimer_init(&(tsk_rt(t)->edfsc_params.deadline_timer), CLOCK_MONOTONIC, HRTIMER_MODE_ABS);

-        

+

         list_add_tail(tsk_rt(t)->edfsc_params.qnode, pending_adds);

-        

+

         if (is_scheduled) {

                 entry = &per_cpu(gsnedf_cpu_entries, task_cpu(t));

                 BUG_ON(entry->scheduled);

                 preempt(entry)

         }

-        

+

         t->rt_param.scheduled_on = NO_CPU;

         t->rt_param.linked_on = NO_CPU;

-        

+

         raw_spin_unlock_irqrestore(&g_lock, flags);

 }

 

-//finds the task_struct of the hrtimer set by task_exit

-static struct task_struct* task_of_timer(struct hrtimer* timer) {

+// finds the task_struct of the hrtimer set by task_exit

+static struct task_struct* task_of_timer(struct hrtimer* timer)

+{

         edfsc_params* a = container_of(timer, edfsc_params, deadline_timer);

         rt_param* b = container_of(a, rt_params, edfsc_params);

         return container_of(b, struct task_struct, rt_param);

 }

 

-static void edfsc_task_exit(struct task_struct* t) {

-        

+static void edfsc_task_exit(struct task_struct* t)

+{

         unsigned long flags;

-        

+

         raw_spin_lock_irqsave(&g_lock, flags);

-        

+

         tsk_rt(t)->edfsc_params.will_remove = 1;

-        

+

         if (is_released(t, litmus_clock())) {

-                hrtimer_start(&(tsk_rt(t)->edfsc_params.deadline_timer), 

+                hrtimer_start(&(tsk_rt(t)->edfsc_params.deadline_timer),

                                                 ns_to_ktime(t->rt_param.job_params.deadline),

                         HRTIMER_MODE_ABS_PINNED);

                 tsk_rt(t)->edfsc_params.deadline_timer.function = asdf; //TODO: hook up task removal function

@@ -579,7 +574,6 @@ static void edfsc_task_exit(struct task_struct* t) {
                 //update system utilizations

                 //next job release will detect will_remove and remove the job

         }

-        

+

         raw_spin_unlock_irqrestore(&g_lock, flags);

-        

-}
\ No newline at end of file
+}