Allow for concurrent blocking / user-space job completions.

2 files changed, 7 insertions, 6 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 93961d08efd5..a78f7f943442 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -51,8 +51,9 @@ void litmus_exit_task(struct task_struct *tsk);
 #define get_user_deadline(t)    (tsk_rt(t)->user_job.deadline)
 
 /*      Realtime utility macros */
-#define get_rt_flags(t)         (tsk_rt(t)->flags)
-#define set_rt_flags(t,f)       (tsk_rt(t)->flags=(f))
+#define get_rt_flags(t)         (tsk_rt(t)->flags)
+#define set_rt_flags(t,f)       (tsk_rt(t)->flags|=(f))
+#define clear_rt_flags(t,f)     (tsk_rt(t)->flags&=(~f))
 #define is_priority_boosted(t)  (tsk_rt(t)->priority_boosted)
 #define get_boost_start(t)  (tsk_rt(t)->boost_start_time)
 
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index 5473ee30cb58..327f476aad74 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -28,14 +28,14 @@ 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_flags(t) & RT_F_BLOCKED) ||                            \
-         (get_rt_job(t) < get_user_job(t) && (get_rt_flags(t) & RT_F_SLEEP)))
+#define is_cblocked(t) (get_rt_flags(t) & RT_F_BLOCKED)
+#define is_ghost(t)                                                     \
+        (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 \
+#define TA(t) (t) ? tsk_mc_data(t) ? is_ghost(t) ? "ghost" : is_cblocked(t) ? "blocked" : t->comm \
                                                  : t->comm : "NULL",    \
                 (t) ? t->pid : 1,                                       \
                 (t) ? get_rt_job(t) : 1,                                \