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

Remove global lock in g_object_weak_ref/unref

Browse Source 
We use the new atomic gobject data replace functions instead.

https://bugzilla.gnome.org/show_bug.cgi?id=682849
This commit is contained in:
Alexander Larsson 2012-08-29 13:31:09 +02:00 committed by Matthias Clasen
parent a30f6a6eb8
commit 968c93a63f
1 changed files with 111 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
gobject/gobject.c
View File

@ -190,7 +190,6 @@ struct _GObjectNotifyQueue
/* --- variables --- */ /* --- variables --- */
G_LOCK_DEFINE_STATIC (closure_array_mutex); G_LOCK_DEFINE_STATIC (closure_array_mutex);
G_LOCK_DEFINE_STATIC (weak_refs_mutex);
G_LOCK_DEFINE_STATIC (toggle_refs_mutex); G_LOCK_DEFINE_STATIC (toggle_refs_mutex);
static GQuark quark_closure_array = 0; static GQuark quark_closure_array = 0;
static GQuark quark_weak_refs = 0; static GQuark quark_weak_refs = 0;
@ -2459,6 +2458,14 @@ typedef struct {
} weak_refs[1]; /* flexible array */ } weak_refs[1]; /* flexible array */
} WeakRefStack; } WeakRefStack;
typedef struct {
GObject *object;
GWeakNotify notify;
gpointer data;
/* out */
WeakRefStack *original_wstack;
} WeakRefData;
static void static void
weak_refs_notify (gpointer data) weak_refs_notify (gpointer data)
{ {
@ -2470,6 +2477,35 @@ weak_refs_notify (gpointer data)
g_free (wstack); g_free (wstack);
} }
static WeakRefStack *
grow_wstack (WeakRefStack *old, WeakRefData *data)
{
WeakRefStack *wstack;
guint i;
data->original_wstack = old;
if (old)
{
i = old->n_weak_refs;
wstack = g_malloc (sizeof (WeakRefStack) + sizeof (old->weak_refs[0]) * i);
memcpy (wstack, old, sizeof (WeakRefStack) + sizeof (old->weak_refs[0]) * (i - 1));
wstack->n_weak_refs++;
}
else
{
i = 0;
wstack = g_new (WeakRefStack, 1);
wstack->n_weak_refs = 1;
wstack->object = data->object;
}
wstack->weak_refs[i].notify = data->notify;
wstack->weak_refs[i].data = data->data;
return wstack;
}
/** /**
* g_object_weak_ref: (skip) * g_object_weak_ref: (skip)
* @object: #GObject to reference weakly * @object: #GObject to reference weakly
@ -2493,32 +2529,68 @@ g_object_weak_ref (GObject *object,
gpointer data) gpointer data)
{ {
WeakRefStack *wstack; WeakRefStack *wstack;
guint i; WeakRefData ref_data;
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (notify != NULL); g_return_if_fail (notify != NULL);
g_return_if_fail (object->ref_count >= 1); g_return_if_fail (object->ref_count >= 1);
G_LOCK (weak_refs_mutex); ref_data.object = object;
wstack = g_datalist_id_remove_no_notify (&object->qdata, quark_weak_refs); ref_data.notify = notify;
if (wstack) ref_data.data = data;
wstack = NULL;
do
{ {
i = wstack->n_weak_refs++; g_free (wstack);
wstack = g_realloc (wstack, sizeof (*wstack) + sizeof (wstack->weak_refs[0]) * i); wstack = g_datalist_id_dup_data (&object->qdata, quark_weak_refs, (GDuplicateFunc)grow_wstack, &ref_data);
} }
else while (!g_datalist_id_replace_data (&object->qdata, quark_weak_refs,
{ ref_data.original_wstack, wstack,
wstack = g_renew (WeakRefStack, NULL, 1); weak_refs_notify, NULL));
wstack->object = object;
wstack->n_weak_refs = 1; /* Free previous wstack, but don't call callbacks */
i = 0; g_free (ref_data.original_wstack);
}
wstack->weak_refs[i].notify = notify;
wstack->weak_refs[i].data = data;
g_datalist_id_set_data_full (&object->qdata, quark_weak_refs, wstack, weak_refs_notify);
G_UNLOCK (weak_refs_mutex);
} }
static WeakRefStack *
shrink_wstack (WeakRefStack *old, WeakRefData *data)
{
WeakRefStack *wstack = NULL;
gboolean found_one = FALSE;
guint i, n;
data->original_wstack = old;
if (old)
{
n = old->n_weak_refs;
for (i = 0; i < n; i++)
if (old->weak_refs[i].notify == data->notify &&
old->weak_refs[i].data == data->data)
{
found_one = TRUE;
if (n > 1)
{
wstack = g_malloc (sizeof (WeakRefStack) + sizeof (old->weak_refs[0]) * (n - 2));
memcpy (wstack, old, sizeof (WeakRefStack) + sizeof (old->weak_refs[0]) * (n - 2));
wstack->n_weak_refs--;
if (i != wstack->n_weak_refs)
wstack->weak_refs[i] = old->weak_refs[wstack->n_weak_refs];
}
break;
}
if (!found_one)
data->original_wstack = NULL;
}
return wstack;
}
/** /**
* g_object_weak_unref: (skip) * g_object_weak_unref: (skip)
* @object: #GObject to remove a weak reference from * @object: #GObject to remove a weak reference from
@ -2533,32 +2605,32 @@ g_object_weak_unref (GObject *object,
gpointer data) gpointer data)
{ {
WeakRefStack *wstack; WeakRefStack *wstack;
gboolean found_one = FALSE; WeakRefData ref_data;
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (notify != NULL); g_return_if_fail (notify != NULL);
G_LOCK (weak_refs_mutex); ref_data.object = object;
wstack = g_datalist_id_get_data (&object->qdata, quark_weak_refs); ref_data.notify = notify;
if (wstack) ref_data.data = data;
wstack = NULL;
do
{ {
guint i; g_free (wstack);
wstack = g_datalist_id_dup_data (&object->qdata, quark_weak_refs, (GDuplicateFunc)shrink_wstack, &ref_data);
for (i = 0; i < wstack->n_weak_refs; i++) if (ref_data.original_wstack == NULL)
if (wstack->weak_refs[i].notify == notify && {
wstack->weak_refs[i].data == data) g_warning ("%s: couldn't find weak ref %p(%p)", G_STRFUNC, notify, data);
{ return;
found_one = TRUE; }
wstack->n_weak_refs -= 1;
if (i != wstack->n_weak_refs)
wstack->weak_refs[i] = wstack->weak_refs[wstack->n_weak_refs];
break;
}
} }
G_UNLOCK (weak_refs_mutex); while (!g_datalist_id_replace_data (&object->qdata, quark_weak_refs,
if (!found_one) ref_data.original_wstack, wstack,
g_warning ("%s: couldn't find weak ref %p(%p)", G_STRFUNC, notify, data); weak_refs_notify, NULL));
/* Free previous wstack, but don't call callbacks */
g_free (ref_data.original_wstack);
} }
/** /**