salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Switch to named semaphores, because OSX.

Browse Source
This commit is contained in:
David Given
2021-12-08 19:46:47 +01:00
parent 1b96f60b2a
commit 3283d6e8c0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/threads.cc
View File

@@ -1,30 +1,37 @@
#include "globals.h" #include "globals.h"
#include "fmt/format.h"
#include <pthread.h> #include <pthread.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <semaphore.h> #include <semaphore.h>
#include "ui.h" #include "ui.h"
static sem_t semaphore; static sem_t* semaphore;
static std::function<void(void)> appCallback; static std::function<void(void)> appCallback;
static std::function<void(void)> uiCallback; static std::function<void(void)> uiCallback;
static pthread_t appThread = 0; static pthread_t appThread = 0;
void UIInitThreading() void UIInitThreading()
{ {
sem_init(&semaphore, 0, 0); std::string name = fmt::format("/com.cowlark.fluxengine.{}", getpid());
semaphore = sem_open(name.c_str(), O_CREAT|O_EXCL, 0, 0);
if (!semaphore)
Error() << fmt::format("cannot create semaphore: {}", strerror(errno));
sem_unlink(name.c_str());
} }
/* Run on the UI thread. */ /* Run on the UI thread. */
static void queue_cb(void*) static void queue_cb(void*)
{ {
uiCallback(); uiCallback();
sem_post(&semaphore); sem_post(semaphore);
} }
void UIRunOnUIThread(std::function<void(void)> callback) void UIRunOnUIThread(std::function<void(void)> callback)
{ {
uiCallback = callback; uiCallback = callback;
uiQueueMain(queue_cb, nullptr); uiQueueMain(queue_cb, nullptr);
sem_wait(&semaphore); sem_wait(semaphore);
} }
static void* appthread_cb(void*) static void* appthread_cb(void*)