LITMUS: improve core

- give TRACE() messages sequence numbers
- remove a some old, unused cruft

2 files changed, 7 insertions, 30 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index a4c49111aa..41c86a3217 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -9,40 +9,14 @@
 #include <linux/jiffies.h>
 #include <litmus/sched_trace.h>
 
-typedef enum {
-        SCHED_LINUX             =  0,
-        SCHED_GSN_EDF           = 10,
-        SCHED_PSN_EDF           = 11,
-        /*      Add your scheduling policy here */
-
-        SCHED_DEFAULT           =  0,
-        SCHED_INVALID           = -1,
-} spolicy;
-
-
-typedef enum {
-        LITMUS_RESERVED_RANGE = 1024,
-
-} sched_setup_cmd_t;
-
-/*      per-task modes */
-enum rt_task_mode_t {
-        BACKGROUND_TASK = 0,
-        LITMUS_RT_TASK  = 1
-};
-
-/*      Plugin boot options, for convenience */
-#define PLUGIN_LINUX            "linux"
-#define PLUGIN_GSN_EDF          "gsn_edf"
-#define PLUGIN_PSN_EDF          "psn_edf"
-
-extern spolicy sched_policy;
-
 /*      RT mode start time      */
 extern volatile unsigned long rt_start_time;
 
+extern atomic_t __log_seq_no;
+
 #define TRACE(fmt, args...) \
-        sched_trace_log_message("%d: " fmt, raw_smp_processor_id(), ## args)
+        sched_trace_log_message("%d P%d: " fmt, atomic_add_return(1, &__log_seq_no), \
+                                raw_smp_processor_id(), ## args)
 
 #define TRACE_TASK(t, fmt, args...) \
         TRACE("(%s/%d) " fmt, (t)->comm, (t)->pid, ##args)
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 595f7e847f..2084bb7de8 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -19,6 +19,9 @@
 atomic_t rt_task_count          = ATOMIC_INIT(0);
 static DEFINE_SPINLOCK(task_transition_lock);
 
+/* Give log messages sequential IDs. */
+atomic_t __log_seq_no = ATOMIC_INIT(0);
+
 /* To send signals from the scheduler
  * Must drop locks first.
  */