Make global context a thread_local variable. Add contextSet().

include/audio.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <common.hpp>
+#include <context.hpp>
 #include <jansson.h>
 #include <vector>
 #include <set>
@@ -106,6 +107,7 @@ struct Port {
 	/** Not owned */
 	Driver* driver = NULL;
 	Device* device = NULL;
+	Context* context;
 
 	Port();
 	virtual ~Port();

include/context.hpp

@@ -47,6 +47,10 @@ void contextInit();
 void contextDestroy();
 /** Returns the global Context pointer */
 Context* contextGet();
+/** Sets the context for this thread.
+You must call this every thread if you want to use the APP macro in that thread.
+*/
+void contextSet(Context* context);
 
 /** Accesses the global Context pointer */
 #define APP rack::contextGet()

include/midi.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <common.hpp>
+#include <context.hpp>
 #include <vector>
 #include <queue>
 #include <set>
@@ -154,6 +155,7 @@ struct Port {
 	/** Not owned */
 	Driver* driver = NULL;
 	Device* device = NULL;
+	Context* context;
 
 	Port();
 	virtual ~Port();

src/audio.cpp

@@ -54,24 +54,30 @@ std::string Device::getDetail(int offset, int maxChannels) {
 
 void Device::processBuffer(const float* input, int inputStride, float* output, int outputStride, int frames) {
 	for (Port* port : subscribed) {
+		// Setting the thread context should probably be the responsibility of Port, but because processInput() etc are overridden, this is the only good place for it.
+		contextSet(port->context);
 		port->processInput(input + port->offset, inputStride, frames);
 	}
 	for (Port* port : subscribed) {
+		contextSet(port->context);
 		port->processBuffer(input + port->offset, inputStride, output + port->offset, outputStride, frames);
 	}
 	for (Port* port : subscribed) {
+		contextSet(port->context);
 		port->processOutput(output + port->offset, outputStride, frames);
 	}
 }
 
 void Device::onOpenStream() {
 	for (Port* port : subscribed) {
+		contextSet(port->context);
 		port->onOpenStream();
 	}
 }
 
 void Device::onCloseStream() {
 	for (Port* port : subscribed) {
+		contextSet(port->context);
 		port->onCloseStream();
 	}
 }
@@ -82,6 +88,7 @@ void Device::onCloseStream() {
 
 Port::Port() {
 	reset();
+	context = contextGet();
 }
 
 Port::~Port() {

src/context.cpp

@@ -45,7 +45,7 @@ Context::~Context() {
 }
 
 
-static Context* context = NULL;
+static thread_local Context* context = NULL;
 
 void contextInit() {
 	assert(!context);
@@ -60,8 +60,13 @@ void contextDestroy() {
 }
 
 Context* contextGet() {
+	assert(context);
 	return context;
 }
 
+void contextSet(Context* context) {
+	rack::context = context;
+}
+
 
 } // namespace rack

src/engine/Engine.cpp

@@ -172,6 +172,7 @@ struct Engine::Internal {
 	HybridBarrier engineBarrier;
 	HybridBarrier workerBarrier;
 	std::atomic<int> workerModuleIndex;
+	Context* context;
 };
 
 
@@ -386,6 +387,7 @@ static void Engine_relaunchWorkers(Engine* that, int threadCount) {
 Engine::Engine() {
 	internal = new Internal;
 
+	internal->context = contextGet();
 	internal->sampleRate = 44100.f;
 	internal->sampleTime = 1 / internal->sampleRate;
 }
@@ -1036,6 +1038,7 @@ void Engine::fromJson(json_t* rootJ) {
 
 void EngineWorker::run() {
 	// Configure thread
+	contextSet(engine->internal->context);
 	system::setThreadName(string::f("Worker %d", id));
 	initMXCSR();
 	random::init();

src/main.cpp

@@ -170,8 +170,8 @@ int main(int argc, char* argv[]) {
 		windowInit();
 	}
 
-	// Initialize app
-	INFO("Initializing app");
+	// Initialize context
+	INFO("Initializing context");
 	contextInit();
 
 	// On Mac, use a hacked-in GLFW addition to get the launched path.
@@ -201,11 +201,11 @@ int main(int argc, char* argv[]) {
 		INFO("Stopped window");
 	}
 
-	// Destroy app
+	// Destroy context
 	if (!settings::headless) {
 		APP->patch->save(asset::autosavePath);
 	}
-	INFO("Destroying app");
+	INFO("Destroying context");
 	contextDestroy();
 	if (!settings::headless) {
 		settings::save(asset::settingsPath);

src/midi.cpp

@@ -33,6 +33,7 @@ void InputDevice::onMessage(const Message &message) {
 		msg.timestamp = system::getNanoseconds();
 
 	for (Input* input : subscribed) {
+		contextSet(input->context);
 		// Filter channel
 		if (input->channel < 0 || msg.getStatus() == 0xf || msg.getChannel() == input->channel) {
 			input->onMessage(msg);
@@ -55,6 +56,7 @@ void OutputDevice::unsubscribe(Output* output) {
 ////////////////////
 
 Port::Port() {
+	context = contextGet();
 }
 
 Port::~Port() {