finishing touches for TRACE() implementation

Remove some stale comments and prevent NULL bytes from being copied into
the TRACE ring-buffer.

4 files changed, 4 insertions, 10 deletions

diff --git a/kernel/edf_common.c b/kernel/edf_common.c
index 0cc93ed50e..8c5f677164 100644
--- a/kernel/edf_common.c
+++ b/kernel/edf_common.c
@@ -11,7 +11,6 @@
 #include <linux/litmus.h>
 #include <linux/sched_plugin.h>
 #include <linux/sched_trace.h>
-/* CLEANUP: #include <linux/plugin_trace.h> */
 
 #include <linux/edf_common.h>
 
diff --git a/kernel/sched_global_edf.c b/kernel/sched_global_edf.c
index a15876fba2..ac4201a872 100644
--- a/kernel/sched_global_edf.c
+++ b/kernel/sched_global_edf.c
@@ -13,7 +13,6 @@
 
 #include <linux/litmus.h>
 #include <linux/sched_plugin.h>
-/* CLEANUP: #include <linux/plugin_trace.h> */
 #include <linux/edf_common.h>
 #include <linux/sched_trace.h>
 
diff --git a/kernel/sched_plugin.c b/kernel/sched_plugin.c
index 31771f7c51..fa8339ba78 100644
--- a/kernel/sched_plugin.c
+++ b/kernel/sched_plugin.c
@@ -8,11 +8,6 @@
 #include <linux/litmus.h>
 #include <linux/sched_plugin.h>
 
-/*
-#include <linux/plugin_trace.h>
-#include <linux/plugin_stats.h>
-*/
-
 
 /* These are the original Linux initialization functions.
  * We replace them here with our initialization code and call them
diff --git a/kernel/sched_trace.c b/kernel/sched_trace.c
index 3d3dcbf432..8ca7fbc5a4 100644
--- a/kernel/sched_trace.c
+++ b/kernel/sched_trace.c
@@ -1,6 +1,5 @@
 /* sched_trace.c -- record scheduling events to a byte stream.
  *
- * TODO: factor out ring buffer code and reuse for tracing facility
  * TODO: Move ring buffer to a lockfree implementation.
  */
 
@@ -514,8 +513,10 @@ void sched_trace_log_message(const char* fmt, ...)
         len = vscnprintf(buf, MSG_SIZE, fmt, args);
 
         queue_lock(&log_buffer_lock);
-        /* put message into buffer, don't forget the trailing null byte */
-        rb_put(&log_buffer.buf, buf, len + 1);
+        /* Don't copy the trailing null byte, we don't want null bytes
+         * in a text file. 
+         */
+        rb_put(&log_buffer.buf, buf, len);
         queue_unlock(&log_buffer_lock);
 
         local_irq_restore(flags);