luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio/tests/tls-interaction: fix two sporadic errors

Browse Source 
The threaded tests are using the default main context in the worker
thread, but were not g_main_context_acquire()ing it first, which meant
that g_tls_interaction_invoke_ask_password() in the main thread would
sometimes succeed in acquiring it itself and thus performing the
operation in the wrong thread. Fix that.

Also, we can't unref the loop from the worker thread, because the main
thread isn't holding a reference on it, and so it might end up being
destroyed while that thread is still inside g_main_loop_quit().
This commit is contained in:
Dan Winship 2011-09-04 10:33:37 -04:00
parent 655c9f5753
commit 15f1ba4721
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/tests/tls-interaction.c
View File

@ -409,14 +409,14 @@ thread_loop (gpointer user_data)
g_assert (test->loop == NULL);
test->loop = g_main_loop_new (context, TRUE);
g_main_context_acquire (context);
g_cond_signal (closure->loop_started);
g_mutex_unlock (closure->loop_mutex);
while (g_main_loop_is_running (test->loop))
g_main_context_iteration (context, TRUE);
g_main_loop_unref (test->loop);
test->loop = NULL;
g_main_context_release (context);
return test;
}
@ -459,7 +459,7 @@ teardown_with_thread_loop (Test *test,
g_assert (check == test);
test->loop_thread = NULL;
g_assert (test->loop == NULL);
g_main_loop_unref (test->loop);
teardown_without_loop (test, unused);
}