Allow events to be cancelled when their list is processed

1 files changed, 5 insertions, 3 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;
 }