From df81cce780f5844a6f904ec76330ec08fe8bc329 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 26 Nov 2010 00:59:54 +0000 Subject: Fix race crash processing event list (Raul::ListImpl seriously needs an audit and heavy testing...) git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2673 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/EventSource.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/engine') diff --git a/src/engine/EventSource.cpp b/src/engine/EventSource.cpp index 27397a8f..ebc12052 100644 --- a/src/engine/EventSource.cpp +++ b/src/engine/EventSource.cpp @@ -76,21 +76,27 @@ EventSource::process(PostProcessor& dest, ProcessContext& context, bool limit) size_t num_events_processed = 0; - QueuedEvent* ev = (QueuedEvent*)_events.front(); - Raul::List::Node* new_head = _events.head(); + Raul::List::Node* head = _events.head(); + Raul::List::Node* tail = head; + + if (!head) + return; + + QueuedEvent* ev = (QueuedEvent*)head->elem(); while (ev && ev->is_prepared() && ev->time() < context.end()) { ev->execute(context); - new_head = new_head->next(); + tail = head; + head = head->next(); ++num_events_processed; if (limit && num_events_processed > MAX_QUEUED_EVENTS) break; - ev = (new_head ? (QueuedEvent*)new_head->elem() : NULL); + ev = (head ? (QueuedEvent*)head->elem() : NULL); } if (num_events_processed > 0) { Raul::List front; - _events.chop_front(front, num_events_processed, new_head); + _events.chop_front(front, num_events_processed, tail); dest.append(&front); } } -- cgit v1.2.1