Feather-Trace: Make inclusion optional

We need to disable Feather-Trace on the Niagara for now, and
there is no reason to always include it, anyway.

3 files changed, 28 insertions, 2 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index 04510237ec..dcb0c1b374 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -1,7 +1,8 @@
-
 #ifndef _SYS_TRACE_H_
 #define _SYS_TRACE_H_
 
+#ifdef CONFIG_FEATHER_TRACE
+
 #include <litmus/feather_trace.h>
 #include <litmus/feather_buffer.h>
 
@@ -26,6 +27,14 @@ asmlinkage void save_timestamp(unsigned long event);
 
 #define TIMESTAMP(id) ft_event0(id, save_timestamp)
 
+
+#else /* !CONFIG_FEATHER_TRACE */
+
+#define TIMESTAMP(id) /* no tracing */
+
+#endif
+
+
 /* Convention for timestamps
  * =========================
  *
diff --git a/litmus/Kconfig b/litmus/Kconfig
index e6c5469d70..7b329d68bd 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -10,6 +10,9 @@ config SCHED_TASK_TRACE
           small overhead in the scheduling code. Disable if the overhead is not
           acceptable (e.g., benchmarking).
 
+          Say Yes for debugging.
+          Say No for overhead tracing.
+
 config SCHED_DEBUG_TRACE
         bool "TRACE() debugging"
         default y
@@ -20,5 +23,17 @@ config SCHED_DEBUG_TRACE
           incurred by the scheduler. Disable if the overhead is not acceptable
           (e.g. benchmarking).
 
+          Say Yes for debugging.
+          Say No for overhead tracing.
+
+config FEATHER_TRACE
+        bool "Feather-Trace Instrumentation Support"
+        default y
+        help
+          Include Feather-Trace trace points. Currently not supported on
+          sparc64.
+
+          Say Yes for overhead tracing.
+
 
 endmenu
diff --git a/litmus/Makefile b/litmus/Makefile
index db8cc21355..ec088a071b 100644
--- a/litmus/Makefile
+++ b/litmus/Makefile
@@ -5,5 +5,7 @@
 obj-y     = sched_plugin.o litmus.o sched_trace.o \
             edf_common.o jobs.o\
             sched_gsn_edf.o sched_psn_edf.o \
-            trace.o ft_event.o rt_domain.o fdso.o sync.o \
+            rt_domain.o fdso.o sync.o \
             fmlp.o srp.o
+
+obj-$(CONFIG_FEATHER_TRACE) += trace.o ft_event.o