Install an invalidation notifier for GClosure in g_source_set_closure()

The point of g_source_set_closure() is getting memory management right,
including handling closures disappearing from the outside (for example
because a runtime they refer to is being shutdown). This means that
sources with an associated closure should remove themselves from the
main loop and free memory when the closure is invalidated.

https://bugzilla.gnome.org/show_bug.cgi?id=692034
This commit is contained in:
Giovanni Campagna 2013-01-03 22:53:06 +01:00
parent e68402e330
commit 1ce415b45b

View File

@ -145,6 +145,13 @@ static GSourceCallbackFuncs closure_callback_funcs = {
closure_callback_get
};
static void
closure_invalidated (gpointer user_data,
GClosure *closure)
{
g_source_destroy (user_data);
}
/**
* g_source_set_closure:
* @source: the source
@ -176,6 +183,8 @@ g_source_set_closure (GSource *source,
g_closure_sink (closure);
g_source_set_callback_indirect (source, closure, &closure_callback_funcs);
g_closure_add_invalidate_notifier (closure, source, closure_invalidated);
if (G_CLOSURE_NEEDS_MARSHAL (closure))
{
GClosureMarshal marshal = (GClosureMarshal)source->source_funcs->closure_marshal;