diff options
author | David Robillard <d@drobilla.net> | 2011-05-18 17:45:39 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-05-18 17:45:39 +0000 |
commit | 177f2b48b6516ba4dee70a709ce28105f1092de2 (patch) | |
tree | 84f6d9b9a026c6d35940e99f2981bd5be537548a /src/server/PostProcessor.cpp | |
parent | 27e3187270807c5e126a2e4bf66211de0f784a28 (diff) | |
download | ingen-177f2b48b6516ba4dee70a709ce28105f1092de2.tar.gz ingen-177f2b48b6516ba4dee70a709ce28105f1092de2.tar.bz2 ingen-177f2b48b6516ba4dee70a709ce28105f1092de2.zip |
Use an intrusive linked list for event queue rather than Raul::List.
This avoids the need to allocate list nodes, improving performance (event throughput), and making EventSource::push_queued realtime safe.
Remove unused queue_size parameter from EventSource and friends.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3282 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/PostProcessor.cpp')
-rw-r--r-- | src/server/PostProcessor.cpp | 55 |
1 files changed, 37 insertions, 18 deletions
diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp index 25252a16..3364322a 100644 --- a/src/server/PostProcessor.cpp +++ b/src/server/PostProcessor.cpp @@ -15,16 +15,16 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <cassert> -#include <pthread.h> +#include <assert.h> + #include "raul/log.hpp" -#include "raul/SRSWQueue.hpp" -#include "events/SendPortValue.hpp" -#include "Event.hpp" -#include "PostProcessor.hpp" -#include "Engine.hpp" + #include "Driver.hpp" +#include "Engine.hpp" +#include "PostProcessor.hpp" #include "ProcessContext.hpp" +#include "QueuedEvent.hpp" +#include "events/SendPortValue.hpp" using namespace std; using namespace Raul; @@ -32,10 +32,9 @@ using namespace Raul; namespace Ingen { namespace Server { -PostProcessor::PostProcessor(Engine& engine, size_t queue_size) +PostProcessor::PostProcessor(Engine& engine) : _engine(engine) , _max_time(0) - , _events(queue_size) , _event_buffer_size(sizeof(Events::SendPortValue)) // FIXME: make generic , _event_buffer((uint8_t*)malloc(_event_buffer_size)) { @@ -47,6 +46,21 @@ PostProcessor::~PostProcessor() } void +PostProcessor::append(QueuedEvent* first, QueuedEvent* last) +{ + assert(first); + assert(last); + QueuedEvent* const head = _head.get(); + QueuedEvent* const tail = _tail.get(); + if (!head) { + _head = first; + } else { + tail->next(first); + } + _tail = last; +} + +void PostProcessor::process() { const FrameTime end_time = _max_time.get(); @@ -75,16 +89,21 @@ PostProcessor::process() } /* Process normal events */ - Raul::List<Event*>::Node* n = _events.head(); - while (n) { - if (n->elem()->time() > end_time) + QueuedEvent* ev = _head.get(); + while (ev) { + if (ev->time() > end_time) break; - Raul::List<Event*>::Node* next = n->next(); - n->elem()->post_process(); - _events.erase(_events.begin()); - delete n->elem(); - delete n; - n = next; + + QueuedEvent* const next = (QueuedEvent*)ev->next(); + ev->post_process(); + if (next) { + _head = next; + } else { + _head = NULL; + _tail = NULL; + } + delete ev; + ev = next; } } |