X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fworker.cc;h=024ec8b6add2ceed20baa07e43ebbb5fb501d125;hb=8139becb1898187729b0ea57f145302d4975bf3a;hp=aea1c6f8e35597a191cf374c617d928376f8dda2;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git

diff --git a/libs/ardour/worker.cc b/libs/ardour/worker.cc
index aea1c6f8e3..024ec8b6ad 100644
--- a/libs/ardour/worker.cc
+++ b/libs/ardour/worker.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2012 Paul Davis
+  Copyright (C) 2012-2016 Paul Davis
   Author: David Robillard
 
   This program is free software; you can redistribute it and/or modify
@@ -22,31 +22,47 @@
 
 #include "ardour/worker.h"
 #include "pbd/error.h"
+#include "pbd/compose.h"
 
 #include <glibmm/timer.h>
 
 namespace ARDOUR {
 
-Worker::Worker(Workee* workee, uint32_t ring_size)
+Worker::Worker(Workee* workee, uint32_t ring_size, bool threaded)
 	: _workee(workee)
-	, _requests(new RingBuffer<uint8_t>(ring_size))
-	, _responses(new RingBuffer<uint8_t>(ring_size))
+	, _requests(threaded ? new PBD::RingBuffer<uint8_t>(ring_size) : NULL)
+	, _responses(new PBD::RingBuffer<uint8_t>(ring_size))
 	, _response((uint8_t*)malloc(ring_size))
-	, _sem(0)
+	, _sem(string_compose ("worker_semaphore%1", this).c_str(), 0)
+	, _thread(NULL)
 	, _exit(false)
-	, _thread (Glib::Threads::Thread::create(sigc::mem_fun(*this, &Worker::run)))
-{}
+	, _synchronous(!threaded)
+{
+	if (threaded) {
+		_thread = Glib::Threads::Thread::create(
+			sigc::mem_fun(*this, &Worker::run));
+	}
+}
 
 Worker::~Worker()
 {
 	_exit = true;
-	_sem.post();
-	_thread->join();
+	_sem.signal();
+	if (_thread) {
+		_thread->join();
+	}
+	delete _responses;
+	delete _requests;
+	free (_response);
 }
 
 bool
 Worker::schedule(uint32_t size, const void* data)
 {
+	if (_synchronous || !_requests) {
+		_workee->work(*this, size, data);
+		return true;
+	}
 	if (_requests->write_space() < size + sizeof(size)) {
 		return false;
 	}
@@ -56,14 +72,14 @@ Worker::schedule(uint32_t size, const void* data)
 	if (_requests->write((const uint8_t*)data, size) != size) {
 		return false;
 	}
-	_sem.post();
+	_sem.signal();
 	return true;
 }
 
 bool
 Worker::respond(uint32_t size, const void* data)
 {
-	if (_requests->write_space() < size + sizeof(size)) {
+	if (_responses->write_space() < size + sizeof(size)) {
 		return false;
 	}
 	if (_responses->write((const uint8_t*)&size, sizeof(size)) != sizeof(size)) {
@@ -76,11 +92,11 @@ Worker::respond(uint32_t size, const void* data)
 }
 
 bool
-Worker::verify_message_completeness(RingBuffer<uint8_t>* rb)
+Worker::verify_message_completeness(PBD::RingBuffer<uint8_t>* rb)
 {
 	uint32_t read_space = rb->read_space();
 	uint32_t size;
-	RingBuffer<uint8_t>::rw_vector vec;
+	PBD::RingBuffer<uint8_t>::rw_vector vec;
 	rb->get_read_vector (&vec);
 	if (vec.len[0] + vec.len[1] < sizeof(size)) {
 		return false;
@@ -124,7 +140,7 @@ Worker::run()
 	while (true) {
 		_sem.wait();
 		if (_exit) {
-			if (buf) free(buf);
+			free(buf);
 			return;
 		}
 
@@ -163,7 +179,7 @@ Worker::run()
 			continue;  // TODO: This is probably fatal
 		}
 
-		_workee->work(size, buf);
+		_workee->work(*this, size, buf);
 	}
 }