Fixed timer issue and atomic remove issue in level A domain.

Timers had an issue where they couldn't be cancelled before they migrated.
Now when you set the start_on_info to inactive, it will prevent a timer
from being armed.

When a task is being blocked and preempted concurrently, the blocking code
needs to be able to prevent the task from being scheduled on another CPU.
This did not work for CE domains. Added a per-domain remove function
which, for ce domains, will prevent a task from being returned by the domain.

1 files changed, 17 insertions, 5 deletions

diff --git a/litmus/ce_domain.c b/litmus/ce_domain.c
index c3ddc9dd63ad..5e1f7ccc000c 100644
--- a/litmus/ce_domain.c
+++ b/litmus/ce_domain.c
@@ -30,6 +30,8 @@ void ce_requeue(domain_t *dom, struct task_struct *ts)
                         "expected_job: %3u\n",
                         asleep, just_finished, expected_job);
 
+        tsk_mc_data(ts)->mc_task.lvl_a_eligible = 1;
+
         /* When coming from job completion, the task will be asleep. */
         if (asleep && just_finished < expected_job) {
                 TRACE_MC_TASK(ts, "appears behind\n");
@@ -41,18 +43,27 @@ void ce_requeue(domain_t *dom, struct task_struct *ts)
 }
 
 /*
+ *
+ */
+void ce_remove(domain_t *dom, struct task_struct *ts)
+{
+        tsk_mc_data(ts)->mc_task.lvl_a_eligible = 0;
+}
+
+/*
  * ce_take_ready and ce_peek_ready
  */
 struct task_struct* ce_peek_and_take_ready(domain_t *dom)
 {
-        struct task_struct *ret = NULL;
         const struct ce_dom_data *ce_data = dom->data;
-        const int exists = NULL != ce_data->should_schedule;
-        const int blocked = exists && !is_running(ce_data->should_schedule);
+        struct task_struct *ret = NULL, *sched = ce_data->should_schedule;
+        const int exists = NULL != sched;
+        const int blocked = exists && !is_running(sched);
+        const int elig = exists && tsk_mc_data(sched)->mc_task.lvl_a_eligible;
 
         /* Return the task we should schedule if it is not blocked or sleeping. */
-        if (exists && !blocked)
-                ret = ce_data->should_schedule;
+        if (exists && !blocked && elig)
+                ret = sched;
         return ret;
 }
 
@@ -78,6 +89,7 @@ void ce_domain_init(domain_t *dom,
         domain_init(dom, lock, requeue, peek_ready, take_ready, preempt_needed,
                         task_prio);
         dom->data = dom_data;
+        dom->remove = ce_remove;
         dom_data->cpu = cpu;
 #ifdef CONFIG_MERGE_TIMERS
         init_event(&dom_data->event, CRIT_LEVEL_A, ce_timer_callback,