Merge branch 'wip-mc' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-mc

7 files changed, 31 insertions, 6 deletions

diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 59350fb78d4f..f98d47ccbb0b 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -31,10 +31,10 @@ typedef struct _rt_domain {
         raw_spinlock_t                  release_lock;
         struct release_queue            release_queue;
 
-#ifdef CONFIG_MERGE_TIMERS
+#if defined(CONFIG_MERGE_TIMERS)
         struct event_group*             event_group;
         int                             prio;
-#elif  CONFIG_RELEASE_MASTER
+#elif defined(CONFIG_RELEASE_MASTER)
         int                             release_master;
 #endif
 
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index 0a1b3f0c718c..740cc11be5d7 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -34,6 +34,7 @@ struct mc_data {
 #define tsk_mc_data(t)   (tsk_rt(t)->mc_data)
 #define tsk_mc_crit(t)   (tsk_mc_data(t)->mc_task.crit)
 #define is_ghost(t)      (tsk_mc_data(t)->mc_job.is_ghost)
+
 #define TS "(%s/%d:%d:%s)"
 #define TA(t) (t) ? tsk_mc_data(t) ? is_ghost(t) ? "ghost" : t->comm \
                                                  : t->comm : "NULL", \
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 7179fc2745ad..5cc05be8332f 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -24,7 +24,8 @@ struct st_param_data {		/* regular params */
         u32     phase;
         u8      partition;
         u8      class;
-        u8      __unused[2];
+        u8      level;
+        u8      __unused[1];
 };
 
 struct st_release_data {        /* A job is was/is going to be released. */
diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index 4fe4aadea8eb..e0c84716d87a 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -12,7 +12,8 @@
 enum task_type_marker {
         TSK_BE,
         TSK_RT,
-        TSK_UNKNOWN
+        TSK_UNKNOWN,
+        TSK_LVLA
 };
 
 struct timestamp {
@@ -111,6 +112,10 @@ feather_callback void save_timestamp_time(unsigned long event, unsigned long tim
 #define TS_LVLA_RELEASE_START           DTIMESTAMP(112, TSK_RT)
 #define TS_LVLA_RELEASE_END             DTIMESTAMP(113, TSK_RT)
 
+#define TS_LVLA_SCHED_START             DTIMESTAMP(114, TSK_UNKNOWN)
+#define TS_LVLA_SCHED_END_ID            115
+#define TS_LVLA_SCHED_END(t)            TTIMESTAMP(TS_LVLA_SCHED_END_ID, t)
+
 
 #define TS_PLUGIN_SCHED_START           /* TIMESTAMP(120) */  /* currently unused */
 #define TS_PLUGIN_SCHED_END             /* TIMESTAMP(121) */
diff --git a/kernel/sched.c b/kernel/sched.c
index c5d775079027..71907dcd8112 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3810,6 +3810,7 @@ need_resched:
         release_kernel_lock(prev);
 need_resched_nonpreemptible:
         TS_SCHED_START;
+        TS_LVLA_SCHED_START;
         sched_trace_task_switch_away(prev);
 
         schedule_debug(prev);
@@ -3859,6 +3860,7 @@ need_resched_nonpreemptible:
                 rq->curr = next;
                 ++*switch_count;
 
+                TS_LVLA_SCHED_END(next);
                 TS_SCHED_END(next);
                 TS_CXS_START(next);
                 context_switch(rq, prev, next); /* unlocks the rq */
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 5ef8d09ab41f..768a2a0f9d2f 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -14,7 +14,11 @@
 #include <litmus/sched_trace.h>
 #include <litmus/feather_trace.h>
 #include <litmus/ftdev.h>
+#include <litmus/rt_domain.h>
+#include <litmus/domain.h>
+#include <litmus/event_group.h>
 
+#include <litmus/sched_mc.h>
 
 #define NO_EVENTS               (1 << CONFIG_SCHED_TASK_TRACE_SHIFT)
 
@@ -132,6 +136,7 @@ feather_callback void do_sched_trace_task_param(unsigned long id, unsigned long
                 rec->data.param.phase     = get_rt_phase(t);
                 rec->data.param.partition = get_partition(t);
                 rec->data.param.class     = get_class(t);
+                rec->data.param.level     = (tsk_mc_data(t) ? tsk_mc_crit(t) : -1);
                 put_record(rec);
         }
 }
diff --git a/litmus/trace.c b/litmus/trace.c
index 49f8246cda50..1d4593aec71d 100644
--- a/litmus/trace.c
+++ b/litmus/trace.c
@@ -5,6 +5,10 @@
 #include <litmus/litmus.h>
 #include <litmus/trace.h>
 
+#include <litmus/domain.h>
+#include <litmus/event_group.h>
+#include <litmus/sched_mc.h>
+
 /******************************************************************************/
 /*                          Allocation                                        */
 /******************************************************************************/
@@ -81,8 +85,15 @@ feather_callback void save_timestamp_def(unsigned long event,
 feather_callback void save_timestamp_task(unsigned long event,
                                           unsigned long t_ptr)
 {
-        int rt = is_realtime((struct task_struct *) t_ptr);
-        __save_timestamp(event, rt ? TSK_RT : TSK_BE);
+        struct task_struct *ts = (struct task_struct*) t_ptr;
+        int rt = is_realtime(ts);
+        uint8_t type = rt ? TSK_RT : TSK_BE;
+
+        if (TS_LVLA_SCHED_END_ID == event) {
+                if (rt && CRIT_LEVEL_A == tsk_mc_crit(ts))
+                        type = TSK_LVLA;
+        }
+        __save_timestamp(event, type);
 }
 
 feather_callback void save_timestamp_cpu(unsigned long event,