Completed PAI for C-EDF.

2 files changed, 22 insertions, 0 deletions

diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 12a9ab65a673..3fc64f832fef 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -75,6 +75,7 @@ typedef void (*clear_prio_inh_klitirqd_t)(struct task_struct* klitirqd,
 
 
 typedef int (*enqueue_pai_tasklet_t)(struct tasklet_struct* tasklet);
+typedef void (*run_tasklets_t)(struct task_struct* next);
 
 /********************* sys call backends  ********************/
 /* This function causes the caller to sleep until the next release */
@@ -125,6 +126,7 @@ struct sched_plugin {
         
 #ifdef CONFIG_LITMUS_PAI_SOFTIRQD
         enqueue_pai_tasklet_t           enqueue_pai_tasklet;
+        run_tasklets_t                          run_tasklets;
 #endif
 } __attribute__ ((__aligned__(SMP_CACHE_BYTES)));
 
diff --git a/include/litmus/sched_trace_external.h b/include/litmus/sched_trace_external.h
index 90424d5c564c..e70e45e4cf51 100644
--- a/include/litmus/sched_trace_external.h
+++ b/include/litmus/sched_trace_external.h
@@ -4,6 +4,8 @@
 #ifndef _LINUX_SCHED_TRACE_EXTERNAL_H_
 #define _LINUX_SCHED_TRACE_EXTERNAL_H_
 
+
+#ifdef CONFIG_SCHED_TASK_TRACE
 extern void __sched_trace_tasklet_begin_external(struct task_struct* t);
 static inline void sched_trace_tasklet_begin_external(struct task_struct* t)
 {
@@ -28,6 +30,7 @@ static inline void sched_trace_work_end_external(struct task_struct* t, struct t
         __sched_trace_work_end_external(t, e, f);
 }
 
+#ifdef CONFIG_LITMUS_NVIDIA
 extern void __sched_trace_nv_interrupt_begin_external(u32 device);
 static inline void sched_trace_nv_interrupt_begin_external(u32 device)
 {
@@ -39,6 +42,23 @@ static inline void sched_trace_nv_interrupt_end_external(u32 device)
 {
         __sched_trace_nv_interrupt_end_external(device);
 }
+#endif
+
+#else
+
+// no tracing.
+static inline void sched_trace_tasklet_begin_external(struct task_struct* t){}
+static inline void sched_trace_tasklet_end_external(struct task_struct* t, unsigned long flushed){}
+static inline void sched_trace_work_begin_external(struct task_struct* t, struct task_struct* e){}
+static inline void sched_trace_work_end_external(struct task_struct* t, struct task_struct* e, unsigned long f){}
+
+#ifdef CONFIG_LITMUS_NVIDIA
+static inline void sched_trace_nv_interrupt_begin_external(u32 device){}
+static inline void sched_trace_nv_interrupt_end_external(u32 device){}
+#endif
+
+#endif
+
 
 #ifdef CONFIG_LITMUS_NVIDIA