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

gmain: Allow GSource methods to be called from a finalize() callback

Browse Source 
Temporarily increase the ref count of a GSource to 1 while calling its
finalize() callback, so that the finalize() implementation can call
GSource methods (like g_source_set_ready_time()) without causing
critical warnings. It’s safe to call those methods at this point, as the
source has been destroyed, but nothing has been freed.

This is an indirect way of fixing a race between GCancellable and
GCancellableSource, whereby the GCancellable::cancelled callback for the
GCancellableSource is not disconnected until the GCancellableSource’s
finalize() function is called. Previously, this meant there was a window
in which the GCancellableSource’s ref count was 0, but the ::cancelled
callback was still connected, and could legitimately be called as a
result of another thread calling g_cancellable_cancel() on the
GCancellable. The callback calls g_source_set_ready_time() on the
GSource, and there’s no thread-safe way of checking whether the GSource
has been destroyed. Instead, we have to change GSource so its ref count
is only decremented to 0 inside the locked section in
g_source_unref_internal() *after* the finalize() function has been
called, and hence after the GCancellable::cancelled callback has been
disconnected. The use of g_cancellable_disconnect() ensures that the
callback disconnection is thread safe.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=781601
This commit is contained in:
Philip Withnall 2017-04-24 21:38:59 +01:00
parent 09762ac4d6
commit 281e301036
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gmain.c
View File

@ -2112,11 +2112,15 @@ g_source_unref_internal (GSource *source,
if (source->source_funcs->finalize) if (source->source_funcs->finalize)
{ {
/* Temporarily increase the ref count again so that GSource methods
* can be called from finalize(). */
source->ref_count++;
if (context) if (context)
UNLOCK_CONTEXT (context); UNLOCK_CONTEXT (context);
source->source_funcs->finalize (source); source->source_funcs->finalize (source);
if (context) if (context)
LOCK_CONTEXT (context); LOCK_CONTEXT (context);
source->ref_count--;
} }
g_free (source->name); g_free (source->name);

5
glib/gmain.h
View File

@ -104,7 +104,10 @@ typedef struct _GSourceCallbackFuncs GSourceCallbackFuncs;
* are needed for this type of event source. The return value of the * are needed for this type of event source. The return value of the
* @dispatch function should be #G_SOURCE_REMOVE if the source should be * @dispatch function should be #G_SOURCE_REMOVE if the source should be
* removed or #G_SOURCE_CONTINUE to keep it. * removed or #G_SOURCE_CONTINUE to keep it.
* @finalize: Called when the source is finalized. * @finalize: Called when the source is finalized. At this point, the source
* will have been destroyed, had its callback cleared, and have been removed
* from its #GMainContext, but it will still have its final reference count;
* so methods can be called on it from within this function.
* *
* The `GSourceFuncs` struct contains a table of * The `GSourceFuncs` struct contains a table of
* functions used to handle event sources in a generic manner. * functions used to handle event sources in a generic manner.