luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-22 07:09:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

gobject: rework g_object_weak_ref() to use _g_datalist_id_update_atomic()

Browse Source 
This is a step step to drop OPTIONAL_BIT_LOCK_WEAK_REFS lock. See the
next commits why that is done.
This commit is contained in:
Thomas Haller 2025-04-05 00:22:59 +02:00 committed by Philip Withnall
parent 4e1039ea76
commit 5da7ed2bc9
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
gobject/gobject.c
View File

@ -3672,6 +3672,40 @@ weak_refs_notify (gpointer data)
g_free (wstack); g_free (wstack);
} }
static gpointer
g_object_weak_ref_cb (gpointer *data,
GDestroyNotify *destroy_notify,
gpointer user_data)
{
GObject *object = ((gpointer *) user_data)[0];
GWeakNotify notify = ((gpointer *) user_data)[1];
gpointer notify_data = ((gpointer *) user_data)[2];
WeakRefStack *wstack = *data;
guint i;
if (!wstack)
{
wstack = g_new (WeakRefStack, 1);
wstack->object = object;
wstack->n_weak_refs = 1;
i = 0;
*destroy_notify = weak_refs_notify;
}
else
{
i = wstack->n_weak_refs++;
wstack = g_realloc (wstack, sizeof (*wstack) + sizeof (wstack->weak_refs[0]) * i);
}
*data = wstack;
wstack->weak_refs[i].notify = notify;
wstack->weak_refs[i].data = notify_data;
return NULL;
}
/** /**
* g_object_weak_ref: (skip) * g_object_weak_ref: (skip)
* @object: #GObject to reference weakly * @object: #GObject to reference weakly
@ -3694,30 +3728,15 @@ g_object_weak_ref (GObject *object,
GWeakNotify notify, GWeakNotify notify,
gpointer data) gpointer data)
{ {
WeakRefStack *wstack;
guint i;
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 (g_atomic_int_get (&object->ref_count) >= 1); g_return_if_fail (g_atomic_int_get (&object->ref_count) >= 1);
object_bit_lock (object, OPTIONAL_BIT_LOCK_WEAK_REFS); object_bit_lock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
wstack = g_datalist_id_remove_no_notify (&object->qdata, quark_weak_notifies); _g_datalist_id_update_atomic (&object->qdata,
if (wstack) quark_weak_notifies,
{ g_object_weak_ref_cb,
i = wstack->n_weak_refs++; ((gpointer[]){ object, notify, data }));
wstack = g_realloc (wstack, sizeof (*wstack) + sizeof (wstack->weak_refs[0]) * i);
}
else
{
wstack = g_renew (WeakRefStack, NULL, 1);
wstack->object = object;
wstack->n_weak_refs = 1;
i = 0;
}
wstack->weak_refs[i].notify = notify;
wstack->weak_refs[i].data = data;
g_datalist_id_set_data_full (&object->qdata, quark_weak_notifies, wstack, weak_refs_notify);
object_bit_unlock (object, OPTIONAL_BIT_LOCK_WEAK_REFS); object_bit_unlock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
} }