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

gobject: rework g_object_weak_unref() 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.

Also, free the WeakRefStack, if there are no more references.
Previously, it was never freed.
This commit is contained in:
Thomas Haller 2025-04-05 00:22:59 +02:00
parent 34b5c17e8d
commit 464f5ac76e
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gobject/gobject.c
View File

@ -3721,6 +3721,45 @@ g_object_weak_ref (GObject *object,
object_bit_unlock (object, OPTIONAL_BIT_LOCK_WEAK_REFS); object_bit_unlock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
} }
static gpointer
g_object_weak_unref_cb (gpointer *data,
GDestroyNotify *destroy_notify,
gpointer user_data)
{
GWeakNotify notify = ((gpointer *) user_data)[0];
gpointer notify_data = ((gpointer *) user_data)[1];
WeakRefStack *wstack = *data;
gboolean found_one = FALSE;
guint i;
if (wstack)
{
for (i = 0; i < wstack->n_weak_refs; i++)
{
if (wstack->weak_refs[i].notify != notify ||
wstack->weak_refs[i].data != notify_data)
continue;
wstack->n_weak_refs -= 1;
if (wstack->n_weak_refs == 0)
{
g_free (wstack);
*data = NULL;
}
else if (i != wstack->n_weak_refs)
wstack->weak_refs[i] = wstack->weak_refs[wstack->n_weak_refs];
found_one = TRUE;
break;
}
}
if (!found_one)
g_critical ("%s: couldn't find weak ref %p(%p)", G_STRFUNC, notify, notify_data);
return NULL;
}
/** /**
* 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
@ -3734,33 +3773,15 @@ g_object_weak_unref (GObject *object,
GWeakNotify notify, GWeakNotify notify,
gpointer data) gpointer data)
{ {
WeakRefStack *wstack;
gboolean found_one = FALSE;
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);
object_bit_lock (object, OPTIONAL_BIT_LOCK_WEAK_REFS); object_bit_lock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
wstack = g_datalist_id_get_data (&object->qdata, quark_weak_notifies); _g_datalist_id_update_atomic (&object->qdata,
if (wstack) quark_weak_notifies,
{ g_object_weak_unref_cb,
guint i; ((gpointer[]) { notify, data }));
for (i = 0; i < wstack->n_weak_refs; i++)
if (wstack->weak_refs[i].notify == notify &&
wstack->weak_refs[i].data == data)
{
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;
}
}
object_bit_unlock (object, OPTIONAL_BIT_LOCK_WEAK_REFS); object_bit_unlock (object, OPTIONAL_BIT_LOCK_WEAK_REFS);
if (!found_one)
g_critical ("%s: couldn't find weak ref %p(%p)", G_STRFUNC, notify, data);
} }
/** /**