diff options
| -rw-r--r-- | src/event/Loop.cxx | 5 | ||||
| -rw-r--r-- | src/event/Loop.hxx | 23 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/event/Loop.cxx b/src/event/Loop.cxx index 1aaca8820..ad20245de 100644 --- a/src/event/Loop.cxx +++ b/src/event/Loop.cxx @@ -23,7 +23,12 @@ void EventLoop::Run() { + assert(thread == nullptr); + thread = g_thread_self(); + g_main_loop_run(loop); + + assert(thread == g_thread_self()); } guint diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx index a222f098d..02befe79e 100644 --- a/src/event/Loop.hxx +++ b/src/event/Loop.hxx @@ -25,25 +25,44 @@ #include <glib.h> +#include <assert.h> + class EventLoop { GMainContext *context; GMainLoop *loop; + /** + * A reference to the thread that is currently inside Run(). + */ + GThread *thread; + public: EventLoop() :context(g_main_context_new()), - loop(g_main_loop_new(context, false)) {} + loop(g_main_loop_new(context, false)), + thread(nullptr) {} struct Default {}; EventLoop(gcc_unused Default _dummy) :context(g_main_context_ref(g_main_context_default())), - loop(g_main_loop_new(context, false)) {} + loop(g_main_loop_new(context, false)), + thread(nullptr) {} ~EventLoop() { g_main_loop_unref(loop); g_main_context_unref(context); } + /** + * Are we currently running inside this EventLoop's thread? + */ + gcc_pure + bool IsInside() const { + assert(thread != nullptr); + + return g_thread_self() == thread; + } + GMainContext *GetContext() { return context; } |