luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix races in unix signal dispatch

Browse Source 
Fix some races introduced in be2c7b83c4
while keeping the property that multiple handlers for the same unix
signal all get dispatched.

Also fix the behaviour of the source checking for pending signals when
it's created.  No matter what we do here (clear the pending flag or not)
there is something that can go wrong.

If we clear the flag, we may prevent other sources from being
dispatched.  If we don't clear it, we may end up dispatching the same
source twice (if we manage to dispatch it from its own thread before the
GLib worker has a chance to run).

Instead, run the full dispatch procedure when a new source is added.  It
actually doesn't matter what thread this runs in since the lock is held.

https://bugzilla.gnome.org/show_bug.cgi?id=711090
This commit is contained in:
Ryan Lortie 2013-10-29 11:11:28 -07:00 committed by Colin Walters
parent 97d9138f6c
commit 76584e7ae3
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
glib/gmain.c
View File

@ -4819,17 +4819,26 @@ wake_source (GSource *source)
}
static void
dispatch_unix_signals (void)
dispatch_unix_signals_unlocked (void)
{
gboolean pending[NSIG];
GSList *node;
gint i;
/* clear this first incase another one arrives while we're processing */
any_unix_signal_pending = FALSE;
G_LOCK(unix_signal_lock);
/* We atomically test/clear the bit from the global array in case
* other signals arrive while we are dispatching.
*
* We then can safely use our own array below without worrying about
* races.
*/
for (i = 0; i < NSIG; i++)
pending[i] = g_atomic_int_compare_and_exchange (&unix_signal_pending[i], TRUE, FALSE);
/* handle GChildWatchSource instances */
if (unix_signal_pending[SIGCHLD])
if (pending[SIGCHLD])
{
/* The only way we can do this is to scan all of the children.
*
@ -4874,7 +4883,7 @@ dispatch_unix_signals (void)
if (!source->pending)
{
if (unix_signal_pending[source->signum])
if (pending[source->signum])
{
source->pending = TRUE;
@ -4883,8 +4892,13 @@ dispatch_unix_signals (void)
}
}
memset ((void*)unix_signal_pending, 0, sizeof (unix_signal_pending));
}
static void
dispatch_unix_signals (void)
{
G_LOCK(unix_signal_lock);
dispatch_unix_signals_unlocked ();
G_UNLOCK(unix_signal_lock);
}
@ -5003,8 +5017,7 @@ _g_main_create_unix_signal_watch (int signum)
G_LOCK (unix_signal_lock);
ref_unix_signal_handler_unlocked (signum);
unix_signal_watches = g_slist_prepend (unix_signal_watches, unix_signal_source);
if (unix_signal_pending[signum])
unix_signal_source->pending = TRUE;
dispatch_unix_signals_unlocked ();
G_UNLOCK (unix_signal_lock);
return source;