orastron/tibia
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vst3 messaging: more thread safeness and error handling

Browse Source
This commit is contained in:
Paolo Marrone 2025-06-11 16:54:34 +02:00
parent 010a8e314b
commit 622b2ba169
1 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
templates/vst3/src/vst3.c
View File

@ -318,9 +318,11 @@ typedef struct pluginInstance {
#ifdef DATA_MESSAGING #ifdef DATA_MESSAGING
Steinberg_Vst_IConnectionPointVtbl *vtblIConnectionPoint; Steinberg_Vst_IConnectionPointVtbl *vtblIConnectionPoint;
Steinberg_Vst_IConnectionPoint *connectedPoint; Steinberg_Vst_IConnectionPoint *connectedPoint;
uint8_t message_data[DATA_MESSAGING_MAX]; uint8_t message_data_in[DATA_MESSAGING_MAX];
size_t message_data_size; size_t message_data_in_size;
char message_data_tosend; // This is to tell message_thread to send data uint8_t message_data_out[DATA_MESSAGING_MAX];
size_t message_data_out_size;
char message_data_out_tosend; // This is to tell message_thread to send data
thrd_t message_thread; thrd_t message_thread;
int message_cmd; int message_cmd;
mtx_t message_mutex; mtx_t message_mutex;
@ -436,7 +438,10 @@ static Steinberg_tresult pluginIConnectionPointConnect(void* thisInterface, stru
if (!other) return Steinberg_kInvalidArgument; if (!other) return Steinberg_kInvalidArgument;
if (p->connectedPoint) return Steinberg_kResultFalse; if (p->connectedPoint) return Steinberg_kResultFalse;
mtx_lock(&p->message_mutex);
p->connectedPoint = other; p->connectedPoint = other;
mtx_unlock(&p->message_mutex);
return Steinberg_kResultOk; return Steinberg_kResultOk;
} }
@ -444,7 +449,9 @@ static Steinberg_tresult pluginIConnectionPointConnect(void* thisInterface, stru
static Steinberg_tresult pluginIConnectionPointDisconnect(void* thisInterface, struct Steinberg_Vst_IConnectionPoint* other) { static Steinberg_tresult pluginIConnectionPointDisconnect(void* thisInterface, struct Steinberg_Vst_IConnectionPoint* other) {
pluginInstance *p = (pluginInstance *)((char *)thisInterface - offsetof(pluginInstance, vtblIConnectionPoint)); pluginInstance *p = (pluginInstance *)((char *)thisInterface - offsetof(pluginInstance, vtblIConnectionPoint));
if (p->connectedPoint && other == p->connectedPoint) { if (p->connectedPoint && other == p->connectedPoint) {
mtx_lock(&p->message_mutex);
p->connectedPoint = NULL; p->connectedPoint = NULL;
mtx_unlock(&p->message_mutex);
return Steinberg_kResultOk; return Steinberg_kResultOk;
} }
return Steinberg_kResultFalse; return Steinberg_kResultFalse;
@ -468,7 +475,11 @@ static Steinberg_tresult pluginIConnectionPointNotify(void* thisInterface, struc
if (!data || size == 0) if (!data || size == 0)
return Steinberg_kResultFalse; return Steinberg_kResultFalse;
plugin_receive_from_ui(&(p->p), data, size); mtx_lock(&p->message_mutex);
memcpy(&p->message_data_in, data, size);
p->message_data_in_size = size;
mtx_unlock(&p->message_mutex);
return Steinberg_kResultOk; return Steinberg_kResultOk;
} }
@ -490,9 +501,9 @@ static char send_to_ui (void *handle, const void *data, size_t bytes) {
if (!data || bytes == 0 || bytes > DATA_MESSAGING_MAX) { if (!data || bytes == 0 || bytes > DATA_MESSAGING_MAX) {
return 1; return 1;
} }
memcpy(p->message_data, data, bytes); memcpy(p->message_data_out, data, bytes);
p->message_data_size = bytes; p->message_data_out_size = bytes;
p->message_data_tosend = 1; p->message_data_out_tosend = 1;
return 0; return 0;
} }
# endif # endif
@ -525,7 +536,8 @@ int message_thread_f(void *arg) {
if (p->message_cmd == 1) { // do work if (p->message_cmd == 1) { // do work
if (!p->connectedPoint || ! p->context) { if (!p->connectedPoint || ! p->context) {
// TODO: What to do there? mtx_unlock(&p->message_mutex);
thrd_sleep(&(struct timespec){.tv_nsec=1e+8}, NULL); // sleep 100 msec
continue; continue;
} }
@ -535,20 +547,25 @@ int message_thread_f(void *arg) {
app->lpVtbl->createInstance(app, (char*) Steinberg_Vst_IMessage_iid, (char*) Steinberg_Vst_IMessage_iid, (void**)&msg); app->lpVtbl->createInstance(app, (char*) Steinberg_Vst_IMessage_iid, (char*) Steinberg_Vst_IMessage_iid, (void**)&msg);
if (!msg) { if (!msg) {
// TODO: what to do here? mtx_unlock(&p->message_mutex);
thrd_sleep(&(struct timespec){.tv_nsec=1e+8}, NULL); // sleep 100 msec
continue; continue;
} }
Steinberg_Vst_IAttributeList *alist = msg->lpVtbl->getAttributes(msg); Steinberg_Vst_IAttributeList *alist = msg->lpVtbl->getAttributes(msg);
if (!alist) { if (!alist) {
// TODO: what to do here? msg->lpVtbl->release(msg);
mtx_unlock(&p->message_mutex);
thrd_sleep(&(struct timespec){.tv_nsec=1e+8}, NULL); // sleep 100 msec
continue; continue;
} }
alist->lpVtbl->setBinary(alist, "message_data", p->message_data, p->message_data_size); alist->lpVtbl->setBinary(alist, "message_data", p->message_data_out, p->message_data_out_size);
Steinberg_tresult r = ov->notify(p->connectedPoint, msg); Steinberg_tresult r = ov->notify(p->connectedPoint, msg);
if (r == Steinberg_kResultFalse) { if (r == Steinberg_kResultFalse) {
// TODO msg->lpVtbl->release(msg);
mtx_unlock(&p->message_mutex);
thrd_sleep(&(struct timespec){.tv_nsec=1e+8}, NULL); // sleep 100 msec
continue; continue;
} }
@ -1271,12 +1288,19 @@ static Steinberg_tresult pluginProcess(void* thisInterface, struct Steinberg_Vst
#endif #endif
#ifdef DATA_MESSAGING #ifdef DATA_MESSAGING
if (p->message_data_tosend) { // message_data_tosend is manipulated by audio thread only if (p->message_data_in_size > 0 || p->message_data_out_tosend) {
if (mtx_trylock(&p->message_mutex) == thrd_success) { if (mtx_trylock(&p->message_mutex) == thrd_success) {
p->message_cmd = 1; if (p->message_data_in_size > 0) {
cnd_signal(&p->message_cond); plugin_receive_from_ui(&(p->p), p->message_data_in, p->message_data_in_size);
p->message_data_in_size = 0;
}
if (p->message_data_out_tosend) { // message_data_out_tosend is manipulated by audio thread only
p->message_cmd = 1;
cnd_signal(&p->message_cond);
p->message_data_out_tosend = 0;
}
mtx_unlock(&p->message_mutex); mtx_unlock(&p->message_mutex);
p->message_data_tosend = 0;
} }
} }
#endif #endif
@ -2702,7 +2726,8 @@ static Steinberg_tresult factoryCreateInstance(void *thisInterface, Steinberg_FI
#ifdef DATA_MESSAGING #ifdef DATA_MESSAGING
p->vtblIConnectionPoint = &pluginVtblIConnectionPoint; p->vtblIConnectionPoint = &pluginVtblIConnectionPoint;
p->connectedPoint = NULL; p->connectedPoint = NULL;
p->message_data_tosend = 0; p->message_data_out_tosend = 0;
p->message_data_in_size = 0;
#endif #endif
*obj = p; *obj = p;
TRACE(" instance: %p\n", (void *)p); TRACE(" instance: %p\n", (void *)p);