Refactor tracing and debugging filenames + CONFIG macros

Tracing and Debugging filenames in Litmus were a bit clumsy. Particularly
it was not immediate to tell the content of a tracing/debugging file from
its name, and it was not intuitive to navigate through the CONFIG
macros. This commit refactors tracing/debugging filenames and the
corresponging CONFIG macros to more intuitive names.

Overhead Tracing (employs Feather Trace):
renamed: include/litmus/trace.h -> include/litmus/sched_trace_ohead.h
renamed: litmus/trace.c -> litmus/sched_trace_ohead.c

Scheduling-related tracing (employs Feather Trace):
renamed: include/litmus/sched_trace.h -> include/litmus/sched_trace_task.h
renamed: litmus/sched_task_trace.c -> litmus/sched_trace_task.c

Debugging (TRACE() macro):
renamed: litmus/sched_trace.c -> litmus/debug_trace.c

4 files changed, 16 insertions, 11 deletions

diff --git a/include/litmus/debug_trace.h b/include/litmus/debug_trace.h
index 48d086d5a44c..bcf5a47f47cc 100644
--- a/include/litmus/debug_trace.h
+++ b/include/litmus/debug_trace.h
@@ -1,7 +1,7 @@
 #ifndef LITMUS_DEBUG_TRACE_H
 #define LITMUS_DEBUG_TRACE_H
 
-#ifdef CONFIG_SCHED_DEBUG_TRACE
+#ifdef CONFIG_LITMUS_DEBUG_TRACE
 void sched_trace_log_message(const char* fmt, ...);
 void dump_trace_buffer(int max);
 #else
@@ -12,7 +12,7 @@ void dump_trace_buffer(int max);
 
 extern atomic_t __log_seq_no;
 
-#ifdef CONFIG_SCHED_DEBUG_TRACE_CALLER
+#ifdef CONFIG_LITMUS_DEBUG_TRACE_CALLER
 #define TRACE_PREFIX "%d P%d [%s@%s:%d]: "
 #define TRACE_ARGS  atomic_add_return(1, &__log_seq_no),        \
                 raw_smp_processor_id(),                         \
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 12af22266331..3f47d496870a 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -6,6 +6,7 @@
 #ifndef _LINUX_LITMUS_H_
 #define _LINUX_LITMUS_H_
 
+#include <linux/sched.h>
 #include <litmus/debug_trace.h>
 
 #ifdef CONFIG_RELEASE_MASTER
@@ -226,7 +227,7 @@ static inline void clear_exit_np(struct task_struct *t)
 
 static inline int is_np(struct task_struct *t)
 {
-#ifdef CONFIG_SCHED_DEBUG_TRACE
+#ifdef CONFIG_LITMUS_DEBUG_TRACE
         int kernel, user;
         kernel = is_kernel_np(t);
         user   = is_user_np(t);
diff --git a/include/litmus/trace.h b/include/litmus/sched_trace_ohead.h
index e2926a08c2f4..1e743599eb5c 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/sched_trace_ohead.h
@@ -1,7 +1,11 @@
-#ifndef _SYS_TRACE_H_
-#define _SYS_TRACE_H_
+/*
+ * sched_trace_overhead.h - wrappers around feather_trace callbacks
+ * for scheduling overheads tracing.
+ */
+#ifndef _SCHED_TRACE_OVERHEAD_H_
+#define _SCHED_TRACE_OVERHEAD_H_
 
-#ifdef CONFIG_SCHED_OVERHEAD_TRACE
+#ifdef CONFIG_SCHED_TRACE_OVERHEAD
 
 #include <litmus/feather_trace.h>
 #include <litmus/feather_buffer.h>
@@ -43,7 +47,7 @@ feather_callback void save_task_latency(unsigned long event, unsigned long when_
 #define LTIMESTAMP(id, task) \
         ft_event1(id, save_task_latency, (unsigned long) task)
 
-#else /* !CONFIG_SCHED_OVERHEAD_TRACE */
+#else /* !CONFIG_SCHED_TRACE_OVERHEAD */
 
 #define TIMESTAMP(id)        /* no tracing */
 
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace_task.h
index 7ca34cb13881..bfe1fc015d4a 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace_task.h
@@ -1,8 +1,8 @@
 /*
- * sched_trace.h -- record scheduler events to a byte stream for offline analysis.
+ * sched_trace_task.h -- record scheduler events to a byte stream for offline analysis.
  */
-#ifndef _LINUX_SCHED_TRACE_H_
-#define _LINUX_SCHED_TRACE_H_
+#ifndef _LINUX_SCHED_TRACE_TASK_H_
+#define _LINUX_SCHED_TRACE_TASK_H_
 
 /* all times in nanoseconds */
 
@@ -123,7 +123,7 @@ struct st_event_record {
 #include <linux/sched.h>
 #include <litmus/feather_trace.h>
 
-#ifdef CONFIG_SCHED_TASK_TRACE
+#ifdef CONFIG_SCHED_TRACE_TASK
 
 #define SCHED_TRACE(id, callback, task) \
         ft_event1(id, callback, task)