Use wx events for invoking on the main thread on OS X

Dispatching to the main queue with GCD does not work when there is a
modal dialog active.
This commit is contained in:
Thomas Goyne 2014-07-17 11:23:05 -07:00
parent e675cf10da
commit 0cc941e559
1 changed files with 65 additions and 36 deletions

View File

@ -17,29 +17,48 @@
#include "libaegisub/dispatch.h"
#include <dispatch/dispatch.h>
#include <mutex>
namespace {
std::function<void (agi::dispatch::Thunk)> invoke_main;
using namespace agi::dispatch;
std::function<void (Thunk)> invoke_main;
struct GCDQueue : agi::dispatch::Queue {
struct OSXQueue : Queue {
virtual void DoSync(Thunk thunk)=0;
};
struct MainQueue final : OSXQueue {
void DoInvoke(Thunk thunk) override { invoke_main(thunk); }
void DoSync(Thunk thunk) {
std::mutex m;
std::condition_variable cv;
std::unique_lock<std::mutex> l(m);
std::exception_ptr e;
bool done = false;
invoke_main([&]{
std::unique_lock<std::mutex> l(m);
try {
thunk();
}
catch (...) {
e = std::current_exception();
}
done = true;
cv.notify_all();
});
cv.wait(l, [&]{ return done; });
if (e) std::rethrow_exception(e);
}
};
struct GCDQueue final : OSXQueue {
dispatch_queue_t queue;
GCDQueue(dispatch_queue_t queue) : queue(queue) { }
void DoInvoke(agi::dispatch::Thunk) override final { }
};
~GCDQueue() { dispatch_release(queue); }
struct OwningQueue final : GCDQueue {
using GCDQueue::GCDQueue;
~OwningQueue() { dispatch_release(queue); }
};
}
namespace agi { namespace dispatch {
void Init(std::function<void (Thunk)> invoke_main) {
::invoke_main = std::move(invoke_main);
}
void Queue::Async(Thunk thunk) {
dispatch_async(static_cast<GCDQueue *>(this)->queue, ^{
void DoInvoke(Thunk thunk) override {
dispatch_async(queue, ^{
try {
thunk();
}
@ -48,12 +67,12 @@ void Queue::Async(Thunk thunk) {
invoke_main([=] { std::rethrow_exception(e); });
}
});
}
}
void Queue::Sync(Thunk thunk) {
void DoSync(Thunk thunk) override {
std::exception_ptr e;
std::exception_ptr *e_ptr = &e;
dispatch_sync(static_cast<GCDQueue *>(this)->queue, ^{
dispatch_sync(queue, ^{
try {
thunk();
}
@ -62,10 +81,20 @@ void Queue::Sync(Thunk thunk) {
}
});
if (e) std::rethrow_exception(e);
}
};
}
namespace agi { namespace dispatch {
void Init(std::function<void (Thunk)> invoke_main) {
::invoke_main = std::move(invoke_main);
}
void Queue::Async(Thunk thunk) { DoInvoke(std::move(thunk)); }
void Queue::Sync(Thunk thunk) { static_cast<OSXQueue *>(this)->DoSync(std::move(thunk)); }
Queue& Main() {
static GCDQueue q(dispatch_get_main_queue());
static MainQueue q;
return q;
}
@ -75,7 +104,7 @@ Queue& Background() {
}
std::unique_ptr<Queue> Create() {
return std::unique_ptr<Queue>(new OwningQueue(dispatch_queue_create("Aegisub worker queue",
return std::unique_ptr<Queue>(new GCDQueue(dispatch_queue_create("Aegisub worker queue",
DISPATCH_QUEUE_SERIAL)));
}
} }