oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/Call: rethrow exceptions in calling thread

Browse Source
This commit is contained in:
Max Kellermann 2016-09-09 17:21:17 +02:00
parent 20894d1c5e
commit 63ab7767a3
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/event/Call.cxx
View File

@ -25,6 +25,8 @@
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "Compiler.h" #include "Compiler.h"
#include <exception>
#include <assert.h> #include <assert.h>
class BlockingCallMonitor final class BlockingCallMonitor final
@ -37,6 +39,8 @@ class BlockingCallMonitor final
bool done; bool done;
std::exception_ptr exception;
public: public:
BlockingCallMonitor(EventLoop &_loop, std::function<void()> &&_f) BlockingCallMonitor(EventLoop &_loop, std::function<void()> &&_f)
:DeferredMonitor(_loop), f(std::move(_f)), done(false) {} :DeferredMonitor(_loop), f(std::move(_f)), done(false) {}
@ -50,13 +54,20 @@ public:
while (!done) while (!done)
cond.wait(mutex); cond.wait(mutex);
mutex.unlock(); mutex.unlock();
if (exception)
std::rethrow_exception(exception);
} }
private: private:
virtual void RunDeferred() override { virtual void RunDeferred() override {
assert(!done); assert(!done);
f(); try {
f();
} catch (...) {
exception = std::current_exception();
}
mutex.lock(); mutex.lock();
done = true; done = true;