1 files changed, 50 insertions, 3 deletions

diff --git a/src/engine/MessageContext.cpp b/src/engine/MessageContext.cpp
index ba03088d..5a180a10 100644
--- a/src/engine/MessageContext.cpp
+++ b/src/engine/MessageContext.cpp
@@ -24,20 +24,68 @@
 #include "PatchImpl.hpp"
 #include "PortImpl.hpp"
 #include "ProcessContext.hpp"
+#include "ThreadManager.hpp"
 
 using namespace std;
 
 namespace Ingen {
 
+
 void
 MessageContext::run(NodeImpl* node)
 {
+	if (ThreadManager::current_thread_id() == THREAD_PRE_PROCESS) {
+		assert(node);
+		Glib::Mutex::Lock lock(_mutex);
+		_request = node;
+		_sem.post();
+		_cond.wait(_mutex);
+	} else if (ThreadManager::current_thread_id() == THREAD_PROCESS) {
+		_requests.write(sizeof(NodeImpl*), &node);
+		// signal() will be called at the end of this process cycle
+	} else if (ThreadManager::current_thread_id() == THREAD_MESSAGE) {
+		cout << "Message context recursion at " << node->path() << endl;
+	} else {
+		cout << "[MessageContext] ERROR: Run requested from unknown thread" << endl;
+	}
+}
+
+
+void
+MessageContext::_run()
+{
+	NodeImpl* node = NULL;
+
+	while (true) {
+		_sem.wait();
+
+		// Run a node requested by the pre-process thread
+		{
+			Glib::Mutex::Lock lock(_mutex);
+			node = _request.get();
+			if (node) {
+				_cond.broadcast(); // Notify caller we got the message
+				run_node(node);
+			}
+		}
+
+		// Run nodes requested by the audio thread
+		while (has_requests()) {
+			_requests.full_read(sizeof(NodeImpl*), &node);
+			run_node(node);
+		}
+	}
+}
+
+
+void
+MessageContext::run_node(NodeImpl* node)
+{
 	node->message_run(*this);
 
 	void*      valid_ports = node->valid_ports();
 	PatchImpl* patch       = node->parent_patch();
 
-	//cout << "MESSAGE RUN " << node->path() << " {" << endl;
 	for (uint32_t i = 0; i < node->num_ports(); ++i) {
 		PortImpl* p = node->port_impl(i);
 		if (p->is_output() && p->context() == Context::MESSAGE &&
@@ -47,12 +95,11 @@ MessageContext::run(NodeImpl* node)
 				ConnectionImpl* ci = dynamic_cast<ConnectionImpl*>(c->get());
 				if (ci->src_port() == p) {
 					ci->dst_port()->pre_process(*_engine.message_context());
-					run(ci->dst_port()->parent_node());
+					run_node(ci->dst_port()->parent_node());
 				}
 			}
 		}
 	}
-	//cout << "}" << endl;
 
 	node->reset_valid_ports();
 }