Integrated group locking with mixed-criticality.

1 files changed, 10 insertions, 5 deletions

diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index f0526e0d5589..d969b18e0b36 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -26,8 +26,13 @@ struct mc_data {
 };
 
 #define tsk_mc_data(t)   (tsk_rt(t)->mc_data)
-#define tsk_mc_crit(t)   (tsk_mc_data(t) ? tsk_mc_data(t)->mc_task.crit : CRIT_LEVEL_C)
-#define is_ghost(t)      (get_rt_job(t) < get_user_job(t))
+#define tsk_mc_crit(t) \
+        (tsk_mc_data(t) ? tsk_mc_data(t)->mc_task.crit : CRIT_LEVEL_C)
+#define is_ghost(t)                                             \
+        ((get_rt_flags(t) & RT_F_BLOCKED) ||                            \
+         (get_rt_job(t) < get_user_job(t) && (get_rt_flags(t) & RT_F_SLEEP)))
+#define ce_sid(ce) \
+        (-((ce)->level * num_online_cpus() + crit_cpu(ce)->cpu + 1))
 
 #define TS "(%s/%d:%d:%d:%s)"
 #define TA(t) (t) ? tsk_mc_data(t) ? is_ghost(t) ? "ghost" : t->comm \
@@ -36,11 +41,11 @@ struct mc_data {
                 (t) ? get_rt_job(t) : 1,                                \
                 (t) ? get_user_job(t) : 1,                              \
                 (t && get_task_domain(t)) ? get_task_domain(t)->name : ""
-#define STRACE(fmt, args...) \
-        sched_trace_log_message("%d P%d      [%s@%s:%d]: " fmt, \
-                                TRACE_ARGS,  ## args)
 #define TRACE_MC_TASK(t, fmt, args...)                          \
         STRACE(TS " " fmt, TA(t), ##args)
+#define TRACE_CRIT_ENTRY(ce, fmt, args...)                      \
+        STRACE("%s P%d, linked=" TS " " fmt,                    \
+              (ce)->domain->name, crit_cpu(ce)->cpu, TA((ce)->linked), ##args)
 
 /*
  * The MC-CE scheduler uses this as domain data.