Fix bugs in tracing and PAI handling

1 files changed, 10 insertions, 4 deletions

diff --git a/litmus/sched_cfifo.c b/litmus/sched_cfifo.c
index 689b2dbe5fae..7fbdec3f1d15 100644
--- a/litmus/sched_cfifo.c
+++ b/litmus/sched_cfifo.c
@@ -57,6 +57,7 @@
 
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
 #include <linux/interrupt.h>
+#include <litmus/trace.h>
 #endif
 
 #ifdef CONFIG_LITMUS_NVIDIA
@@ -530,6 +531,9 @@ static void do_lit_tasklets(cfifo_domain_t* cluster, struct task_struct* sched_t
         unsigned long flags;
         
         while(work_to_do) {
+                
+                TS_NV_SCHED_BOTISR_START;
+                
                 // remove tasklet at head of list if it has higher priority.
                 raw_spin_lock_irqsave(&cluster->cfifo_lock, flags);     
                 
@@ -584,6 +588,8 @@ static void do_lit_tasklets(cfifo_domain_t* cluster, struct task_struct* sched_t
                 
                 raw_spin_unlock_irqrestore(&cluster->cfifo_lock, flags);
                 
+                TS_NV_SCHED_BOTISR_END;
+                
                 if(tasklet) {
                         __do_lit_tasklet(tasklet, 0ul);
                         tasklet = NULL; 
@@ -1071,6 +1077,10 @@ static void cfifo_task_exit(struct task_struct * t)
         unsigned long flags;
         cfifo_domain_t *cluster = task_cpu_cluster(t);
 
+#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
+        flush_tasklets(cluster, t);
+#endif          
+        
         /* unlink if necessary */
         raw_spin_lock_irqsave(&cluster->cfifo_lock, flags);
         unlink(t);
@@ -1081,10 +1091,6 @@ static void cfifo_task_exit(struct task_struct * t)
                 tsk_rt(t)->scheduled_on = NO_CPU;
         }
         raw_spin_unlock_irqrestore(&cluster->cfifo_lock, flags);
-
-#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
-        flush_tasklets(cluster, t);
-#endif  
         
         BUG_ON(!is_realtime(t));
         TRACE_TASK(t, "RIP\n");