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

gmain: Make GChildWatchSource child_exited field atomic

Browse Source 
Ensure synchronization between prepare / check of GChildWatchsource and
UNIX signal dispatcher by making operations on `child_exited` field
atomic. Use `child_exited` as publication flag for `child_status`.

Issue #1312.
This commit is contained in:
Tomasz Miąsko 2018-11-01 00:00:00 +00:00
parent 1c8f3c67c3
commit d2fd53df03
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/gmain.c
View File

@ -5107,7 +5107,7 @@ dispatch_unix_signals_unlocked (void)
{ {
GChildWatchSource *source = node->data; GChildWatchSource *source = node->data;
if (!source->child_exited) if (!g_atomic_int_get (&source->child_exited))
{ {
pid_t pid; pid_t pid;
do do
@ -5117,14 +5117,14 @@ dispatch_unix_signals_unlocked (void)
pid = waitpid (source->pid, &source->child_status, WNOHANG); pid = waitpid (source->pid, &source->child_status, WNOHANG);
if (pid > 0) if (pid > 0)
{ {
source->child_exited = TRUE; g_atomic_int_set (&source->child_exited, TRUE);
wake_source ((GSource *) source); wake_source ((GSource *) source);
} }
else if (pid == -1 && errno == ECHILD) else if (pid == -1 && errno == ECHILD)
{ {
g_warning ("GChildWatchSource: Exit status of a child process was requested but ECHILD was received by waitpid(). See the documentation of g_child_watch_source_new() for possible causes."); g_warning ("GChildWatchSource: Exit status of a child process was requested but ECHILD was received by waitpid(). See the documentation of g_child_watch_source_new() for possible causes.");
source->child_exited = TRUE;
source->child_status = 0; source->child_status = 0;
g_atomic_int_set (&source->child_exited, TRUE);
wake_source ((GSource *) source); wake_source ((GSource *) source);
} }
} }
@ -5167,7 +5167,7 @@ g_child_watch_prepare (GSource *source,
child_watch_source = (GChildWatchSource *) source; child_watch_source = (GChildWatchSource *) source;
return child_watch_source->child_exited; return g_atomic_int_get (&child_watch_source->child_exited);
} }
static gboolean static gboolean
@ -5177,7 +5177,7 @@ g_child_watch_check (GSource *source)
child_watch_source = (GChildWatchSource *) source; child_watch_source = (GChildWatchSource *) source;
return child_watch_source->child_exited; return g_atomic_int_get (&child_watch_source->child_exited);
} }
static gboolean static gboolean