Make sched_trace conditional.

TODO: Make it a .config option.

3 files changed, 36 insertions, 3 deletions

diff --git a/include/linux/sched_trace.h b/include/linux/sched_trace.h
index 5e5a91cf70..67395e6e0c 100644
--- a/include/linux/sched_trace.h
+++ b/include/linux/sched_trace.h
@@ -87,7 +87,7 @@ typedef struct {
         pid_t                   donor;
 } cap_allocation_record_t;
 
-
+#ifdef SCHED_TASK_TRACE
 void sched_trace_scheduler_invocation(void);
 
 void sched_trace_task_arrival(struct task_struct *t);
@@ -118,6 +118,33 @@ void sched_trace_server_completion(int id, unsigned int budget,
 void sched_trace_server_scheduled(int id, task_class_t class,
                                   unsigned int budget, jiffie_t deadline);
 
+#else
+#define sched_trace_scheduler_invocation(x)
+
+#define  sched_trace_task_arrival(t)
+#define sched_trace_task_departure(t)
+#define sched_trace_task_preemption(t, by)
+#define sched_trace_task_scheduled(t)
+#define sched_trace_job_release(t)
+#define sched_trace_job_completion(t)
+#define sched_trace_capacity_release(t)
+#define sched_trace_capacity_allocation(t, budget, deadline,  donor)
+#define sched_trace_capacity_alloc_srv(srv, srv_dl, cls, srv_budget,\
+        budget, deadline, donor)
+#define sched_trace_server_release(id, wcet, period, class)
+#define sched_trace_server_completion(id, budget, deadline, class)
+#define sched_trace_server_scheduled(id, class, budget, deadline)
+#endif
+
+
+#ifdef SCHED_DEBUG_TRACE
 void sched_trace_log_message(const char* fmt, ...);
 
+#else
+
+#define sched_trace_log_message(fmt, ...)
+
+#endif
+
+
 #endif
diff --git a/kernel/sched_trace.c b/kernel/sched_trace.c
index 5911488933..9081fbe367 100644
--- a/kernel/sched_trace.c
+++ b/kernel/sched_trace.c
@@ -499,6 +499,9 @@ module_init(init_sched_trace);
 /* The per-CPU LITMUS log buffer. Don't put it on the stack, it is too big for
  * that and the kernel gets very picky with nested interrupts and small stacks.
  */
+
+#ifdef SCHED_DEBUG_TRACE
+
 #define MSG_SIZE 255
 static DEFINE_PER_CPU(char[MSG_SIZE], fmt_buffer);
 
@@ -534,6 +537,9 @@ void sched_trace_log_message(const char* fmt, ...)
         va_end(args);
 }
 
+#endif
+
+#ifdef SCHED_TASK_TRACE
 
 static inline void  __put_trace(char* mem, size_t size) 
 {
@@ -714,3 +720,5 @@ void sched_trace_capacity_alloc_srv(pid_t srv, u32 srv_dl, task_class_t cls,
         rec.deadline       = deadline;
         put_trace(rec);
 }
+
+#endif
diff --git a/lib/semaphore-sleepers.c b/lib/semaphore-sleepers.c
index e500018f51..3f4d54344d 100644
--- a/lib/semaphore-sleepers.c
+++ b/lib/semaphore-sleepers.c
@@ -15,8 +15,6 @@
 #include <linux/sched.h>
 #include <linux/err.h>
 #include <linux/init.h>
-#include <linux/sched_plugin.h>
-#include <linux/litmus.h>
 #include <asm/semaphore.h>
 
 /*