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

g_static_private_free: defer non-trivial destruction til after we unlock

Browse Source 
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=642026
Bug-NB: NB#257512
This commit is contained in:
Simon McVittie 2011-05-24 16:02:33 +01:00 committed by Matthias Clasen
parent d5f0ec1e8e
commit b05f0b351c
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
glib/gthread.c
View File

@ -1762,6 +1762,7 @@ g_static_private_free (GStaticPrivate *private_key)
{ {
guint idx = private_key->index; guint idx = private_key->index;
GRealThread *thread; GRealThread *thread;
GArray *garbage = NULL;
if (!idx) if (!idx)
return; return;
@ -1789,15 +1790,39 @@ g_static_private_free (GStaticPrivate *private_key)
if (ddestroy) if (ddestroy)
{ {
G_UNLOCK (g_thread); /* defer non-trivial destruction til after we've finished
ddestroy (ddata); * iterating, since we must continue to hold the lock */
G_LOCK (g_thread); if (garbage == NULL)
garbage = g_array_new (FALSE, TRUE,
sizeof (GStaticPrivateNode));
g_array_set_size (garbage, garbage->len + 1);
node = &g_array_index (garbage, GStaticPrivateNode,
garbage->len - 1);
node->data = ddata;
node->destroy = ddestroy;
} }
} }
} }
g_thread_free_indeces = g_slist_prepend (g_thread_free_indeces, g_thread_free_indeces = g_slist_prepend (g_thread_free_indeces,
GUINT_TO_POINTER (idx)); GUINT_TO_POINTER (idx));
G_UNLOCK (g_thread); G_UNLOCK (g_thread);
if (garbage)
{
guint i;
for (i = 0; i < garbage->len; i++)
{
GStaticPrivateNode *node;
node = &g_array_index (garbage, GStaticPrivateNode, i);
node->destroy (node->data);
}
g_array_free (garbage, TRUE);
}
} }
/* GThread Extra Functions {{{1 ------------------------------------------- */ /* GThread Extra Functions {{{1 ------------------------------------------- */