diff options
| -rw-r--r-- | src/io_thread.c | 13 | ||||
| -rw-r--r-- | src/io_thread.h | 7 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/io_thread.c b/src/io_thread.c index a0e3a8844..fa6dee337 100644 --- a/src/io_thread.c +++ b/src/io_thread.c @@ -107,6 +107,12 @@ io_thread_context(void) return io.context; } +bool +io_thread_inside(void) +{ + return io.thread != NULL && g_thread_self() == io.thread; +} + guint io_thread_idle_add(GSourceFunc function, gpointer data) { @@ -154,6 +160,13 @@ io_thread_call_func(gpointer _data) gpointer io_thread_call(GThreadFunc function, gpointer _data) { + assert(io.thread != NULL); + + if (io_thread_inside()) + /* we're already in the I/O thread - no + synchronization needed */ + return function(_data); + struct call_data data = { .function = function, .data = _data, diff --git a/src/io_thread.h b/src/io_thread.h index db925ab8f..c91597225 100644 --- a/src/io_thread.h +++ b/src/io_thread.h @@ -52,6 +52,13 @@ G_GNUC_PURE GMainContext * io_thread_context(void); +/** + * Is the current thread the I/O thread? + */ +G_GNUC_PURE +bool +io_thread_inside(void); + guint io_thread_idle_add(GSourceFunc function, gpointer data); |