luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Work around deadlock in unix-streams test

Browse Source
This commit is contained in:
Matthias Clasen 2010-07-29 00:52:34 -04:00
parent b463b2ea25
commit 04c7abba11
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gio/tests/unix-streams.c
View File

@ -34,6 +34,17 @@ int writer_pipe[2], reader_pipe[2];
GCancellable *writer_cancel, *reader_cancel, *main_cancel;
GMainLoop *loop;
static gboolean
cancel_main (gpointer data)
{
GCancellable *main_cancel = data;
g_cancellable_cancel (main_cancel);
return FALSE;
}
static gpointer
writer_thread (gpointer user_data)
{
@ -64,7 +75,17 @@ writer_thread (gpointer user_data)
if (g_cancellable_is_cancelled (writer_cancel))
{
g_cancellable_cancel (main_cancel);
/* FIXME: directly calling g_cancellable_cancel (main_cancel) here
* leads to sporadic deadlock, because it will try to wake up the
* main context, for which it needs to acquire the main context lock.
* This lock may be held by the main loop running in the main thread,
* and it may be held while the main thread is blocking in
* fd_source_finalize -> g_cancellable_disconnect
* until the ::cancelled callbacks have run.
*
* Work around by deferring the cancellation to a timeout.
*/
g_timeout_add (0, cancel_main, main_cancel);
g_object_unref (out);
return NULL;
}