1 files changed, 18 insertions, 14 deletions

diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 4924da21865e..02106f455c0f 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -124,7 +124,6 @@ typedef struct clusterdomain {
         
         
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
-        raw_spinlock_t tasklet_lock;
         struct tasklet_head pending_tasklets;
 #endif  
         
@@ -430,7 +429,7 @@ static void cedf_tick(struct task_struct* t)
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
 
 
-void __do_lit_tasklet(struct tasklet_struct* tasklet, unsigned long flushed)
+static void __do_lit_tasklet(struct tasklet_struct* tasklet, unsigned long flushed)
 {
         if (!atomic_read(&tasklet->count)) {
                 sched_trace_tasklet_begin(tasklet->owner);
@@ -451,7 +450,7 @@ void __do_lit_tasklet(struct tasklet_struct* tasklet, unsigned long flushed)
 }
 
 
-void __extract_tasklets(cedf_domain_t* cluster, struct task_struct* task, struct tasklet_head* task_tasklets)
+static void __extract_tasklets(cedf_domain_t* cluster, struct task_struct* task, struct tasklet_head* task_tasklets)
 {
         struct tasklet_struct* step;
         struct tasklet_struct* tasklet;
@@ -497,7 +496,7 @@ void __extract_tasklets(cedf_domain_t* cluster, struct task_struct* task, struct
         }
 }
 
-void flush_tasklets(cedf_domain_t* cluster, struct task_struct* task)
+static void flush_tasklets(cedf_domain_t* cluster, struct task_struct* task)
 {
         unsigned long flags;
         struct tasklet_head task_tasklets;
@@ -524,18 +523,18 @@ void flush_tasklets(cedf_domain_t* cluster, struct task_struct* task)
 }
 
 
-void do_lit_tasklets(cedf_domain_t* cluster, struct task_struct* sched_task)
+static void do_lit_tasklets(cedf_domain_t* cluster, struct task_struct* sched_task)
 {
         int work_to_do = 1;
         struct tasklet_struct *tasklet = NULL;
-        struct tasklet_struct *step;
+        //struct tasklet_struct *step;
         unsigned long flags;
         
         while(work_to_do) {
                 // remove tasklet at head of list if it has higher priority.
                 raw_spin_lock_irqsave(&cluster->cedf_lock, flags);      
 
-
+/*
                 step = cluster->pending_tasklets.head;
                 TRACE("%s: (BEFORE) dumping tasklet queue...\n", __FUNCTION__);
                 while(step != NULL){
@@ -544,6 +543,7 @@ void do_lit_tasklets(cedf_domain_t* cluster, struct task_struct* sched_task)
                 }
                 TRACE("%s: tail = %p (%d)\n", __FUNCTION__, *(cluster->pending_tasklets.tail), (*(cluster->pending_tasklets.tail) != NULL) ? (*(cluster->pending_tasklets.tail))->owner->pid : -1);
                 TRACE("%s: done.\n", __FUNCTION__);
+ */
         
 
                 if(cluster->pending_tasklets.head != NULL) {
@@ -573,6 +573,7 @@ void do_lit_tasklets(cedf_domain_t* cluster, struct task_struct* sched_task)
                 }
 
 
+                /*
                 step = cluster->pending_tasklets.head;
                 TRACE("%s: (AFTER) dumping tasklet queue...\n", __FUNCTION__);
                 while(step != NULL){
@@ -581,6 +582,7 @@ void do_lit_tasklets(cedf_domain_t* cluster, struct task_struct* sched_task)
                 }
                 TRACE("%s: tail = %p (%d)\n", __FUNCTION__, *(cluster->pending_tasklets.tail), (*(cluster->pending_tasklets.tail) != NULL) ? (*(cluster->pending_tasklets.tail))->owner->pid : -1);
                 TRACE("%s: done.\n", __FUNCTION__);
+                 */
         
 
                 raw_spin_unlock_irqrestore(&cluster->cedf_lock, flags);
@@ -598,7 +600,7 @@ void do_lit_tasklets(cedf_domain_t* cluster, struct task_struct* sched_task)
 }
 
 
-void run_tasklets(struct task_struct* sched_task)
+static void run_tasklets(struct task_struct* sched_task)
 {
         cedf_domain_t* cluster;
 
@@ -641,10 +643,11 @@ void run_tasklets(struct task_struct* sched_task)
 }
 
 
-void __add_pai_tasklet(struct tasklet_struct* tasklet, cedf_domain_t* cluster)
+static void __add_pai_tasklet(struct tasklet_struct* tasklet, cedf_domain_t* cluster)
 {
         struct tasklet_struct* step;
         
+        /*
         step = cluster->pending_tasklets.head;
         TRACE("%s: (BEFORE) dumping tasklet queue...\n", __FUNCTION__);
         while(step != NULL){
@@ -653,6 +656,7 @@ void __add_pai_tasklet(struct tasklet_struct* tasklet, cedf_domain_t* cluster)
         }
         TRACE("%s: tail = %p (%d)\n", __FUNCTION__, *(cluster->pending_tasklets.tail), (*(cluster->pending_tasklets.tail) != NULL) ? (*(cluster->pending_tasklets.tail))->owner->pid : -1);
         TRACE("%s: done.\n", __FUNCTION__);
+         */
         
         
         tasklet->next = NULL;  // make sure there are no old values floating around
@@ -674,7 +678,7 @@ void __add_pai_tasklet(struct tasklet_struct* tasklet, cedf_domain_t* cluster)
         }
         else {
 
-        WARN_ON(1 == 1);
+        //WARN_ON(1 == 1);
 
                 // insert the tasklet somewhere in the middle.
 
@@ -699,7 +703,7 @@ void __add_pai_tasklet(struct tasklet_struct* tasklet, cedf_domain_t* cluster)
                 }
         }
         
-        
+        /*
         step = cluster->pending_tasklets.head;
         TRACE("%s: (AFTER) dumping tasklet queue...\n", __FUNCTION__);
         while(step != NULL){
@@ -707,7 +711,8 @@ void __add_pai_tasklet(struct tasklet_struct* tasklet, cedf_domain_t* cluster)
                 step = step->next;
         }
         TRACE("%s: tail = %p (%d)\n", __FUNCTION__, *(cluster->pending_tasklets.tail), (*(cluster->pending_tasklets.tail) != NULL) ? (*(cluster->pending_tasklets.tail))->owner->pid : -1);
-        TRACE("%s: done.\n", __FUNCTION__);     
+        TRACE("%s: done.\n", __FUNCTION__);
+         */
         
 // TODO: Maintain this list in priority order.
 //      tasklet->next = NULL;
@@ -715,7 +720,7 @@ void __add_pai_tasklet(struct tasklet_struct* tasklet, cedf_domain_t* cluster)
 //      cluster->pending_tasklets.tail = &tasklet->next;
 }
 
-int enqueue_pai_tasklet(struct tasklet_struct* tasklet)
+static int enqueue_pai_tasklet(struct tasklet_struct* tasklet)
 {
         cedf_domain_t *cluster = NULL;
         cpu_entry_t *targetCPU = NULL;
@@ -1909,7 +1914,6 @@ static long cedf_activate_plugin(void)
 
                 
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
-                raw_spin_lock_init(&(cedf[i].tasklet_lock));
                 cedf[i].pending_tasklets.head = NULL;
                 cedf[i].pending_tasklets.tail = &(cedf[i].pending_tasklets.head);
 #endif