Allow events to be cancelled when their list is processed

3 files changed, 9 insertions, 6 deletions

diff --git a/litmus/event_group.c b/litmus/event_group.c
index 518ccb459137..365ec1ee3651 100644
--- a/litmus/event_group.c
+++ b/litmus/event_group.c
@@ -33,7 +33,7 @@ static enum hrtimer_restart on_timer(struct hrtimer *timer)
         unsigned long num = 0;
         struct event_list *el;
         struct rt_event *e;
-        struct list_head *pos, *safe, events;
+        struct list_head *pos, safe, events;
 
         el = container_of(timer, struct event_list, timer);
 
@@ -47,16 +47,18 @@ static enum hrtimer_restart on_timer(struct hrtimer *timer)
         list_replace_init(&el->events, &events);
 
         /* Fire events */
-        list_for_each_safe(pos, safe, &events) {
+        for (pos = events.next; prefetch(pos->next), pos != &events;) {
                 num++;
                 e = list_entry(pos, struct rt_event, events_node);
                 VTRACE("Dequeueing event 0x%p with prio %d from 0x%p\n",
                       e, e->prio, el);
+                list_replace(pos, &safe);
                 list_del_init(pos);
                 e->function(e);
+                pos = safe.next;
         }
         VTRACE("Exhausted %d events from list 0x%p\n", num, el);
-        sched_trace_action(NULL, num);
+        /* sched_trace_action(NULL, num); */
         return HRTIMER_NORESTART;
 }
 
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index f242f33e990e..3355eb5a73be 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -406,7 +406,7 @@ static void pd_requeue(domain_t *dom, struct task_struct *task)
         rt_domain_t *domain = (rt_domain_t*)dom->data;
 
         BUG_ON(!task || !is_realtime(task));
-        TRACE_TASK(task, "Requeueing");
+        TRACE_TASK(task, "Requeueing\n");
         BUG_ON(is_queued(task));
         BUG_ON(get_task_domain(task) != dom);
 
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index 61eb961eda23..1d1ecbb8c9c4 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -407,10 +407,10 @@ static void preempt(struct domain *dom, struct crit_entry *ce)
         TRACE_CRIT_ENTRY(ce, "Preempted by " TS "\n", TA(task));
 
         /* Per-domain preemption */
+        link_task_to_crit(ce, task);
         if (old && can_requeue(old)) {
                 dom->requeue(dom, old);
         }
-        link_task_to_crit(ce, task);
         update_crit_position(ce);
 
         /* Preempt actual execution if this is a running task */
@@ -987,7 +987,8 @@ void mc_finish_switch(struct task_struct *prev)
 {
         struct cpu_entry* entry = &__get_cpu_var(cpus);
         entry->scheduled = is_realtime(current) ? current : NULL;
-        TRACE_TASK(prev, "Switched away from\n");
+        TRACE_TASK(prev, "Switched away from to (something/%d)\n",
+                   ((entry->scheduled) ? entry->scheduled->pid : 0));
 }
 
 /*