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

io_thread: fix race condition during startup

Browse Source 
Ensure that the io.thread variable is set before entering the event
loop.
This commit is contained in:
Max Kellermann 2011-11-27 19:28:21 +01:00
parent ef369c2e2b
commit 37420c342b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/io_thread.c
View File

@ -34,6 +34,7 @@ static struct {
void void
io_thread_run(void) io_thread_run(void)
{ {
assert(io_thread_inside());
assert(io.context != NULL); assert(io.context != NULL);
assert(io.loop != NULL); assert(io.loop != NULL);
@ -43,6 +44,11 @@ io_thread_run(void)
static gpointer static gpointer
io_thread_func(G_GNUC_UNUSED gpointer arg) io_thread_func(G_GNUC_UNUSED gpointer arg)
{ {
/* lock+unlock to synchronize with io_thread_start(), to be
sure that io.thread is set */
g_mutex_lock(io.mutex);
g_mutex_unlock(io.mutex);
io_thread_run(); io_thread_run();
return NULL; return NULL;
} }
@ -67,7 +73,9 @@ io_thread_start(GError **error_r)
assert(io.loop != NULL); assert(io.loop != NULL);
assert(io.thread == NULL); assert(io.thread == NULL);
g_mutex_lock(io.mutex);
io.thread = g_thread_create(io_thread_func, NULL, true, error_r); io.thread = g_thread_create(io_thread_func, NULL, true, error_r);
g_mutex_unlock(io.mutex);
if (io.thread == NULL) if (io.thread == NULL)
return false; return false;