luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 09:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gobject: extract duplicate code for toggle reference in g_object_unref()

Browse Source 
Move comment logic to one place. Add toggle_refs_check_and_ref_or_deref().
This commit is contained in:
Thomas Haller 2024-01-30 12:29:05 +01:00 committed by Philip Withnall
parent 1bb5661198
commit f17cfcf930
1 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
gobject/gobject.c
View File

@ -3949,25 +3949,54 @@ typedef struct {
} toggle_refs[1]; /* flexible array */ } toggle_refs[1]; /* flexible array */
} ToggleRefStack; } ToggleRefStack;
static GToggleNotify G_ALWAYS_INLINE static inline gboolean
toggle_refs_get_notify_unlocked (GObject *object, toggle_refs_check_and_ref_or_deref (GObject *object,
gpointer *out_data) gboolean is_ref,
gint *old_ref,
GToggleNotify *toggle_notify,
gpointer *toggle_data)
{
const gint ref_curr = is_ref ? 1 : 2;
const gint ref_next = is_ref ? 2 : 1;
gboolean success;
#if G_ENABLE_DEBUG
g_assert (ref_curr == *old_ref);
#endif
*toggle_notify = NULL;
*toggle_data = NULL;
object_bit_lock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
/* @old_ref is mainly an (out) parameter. On failure to compare-and-exchange,
* we MUST return the new value which the caller will use for retry.*/
success = g_atomic_int_compare_and_exchange_full ((int *) &object->ref_count,
ref_curr,
ref_next,
old_ref);
if (success && OBJECT_HAS_TOGGLE_REF (object))
{ {
ToggleRefStack *tstackptr; ToggleRefStack *tstackptr;
if (!OBJECT_HAS_TOGGLE_REF (object))
return NULL;
tstackptr = g_datalist_id_get_data (&object->qdata, quark_toggle_refs); tstackptr = g_datalist_id_get_data (&object->qdata, quark_toggle_refs);
if (tstackptr->n_toggle_refs != 1) if (tstackptr->n_toggle_refs != 1)
{ {
g_critical ("Unexpected number of toggle-refs. g_object_add_toggle_ref() must be paired with g_object_remove_toggle_ref()"); g_critical ("Unexpected number of toggle-refs. g_object_add_toggle_ref() must be paired with g_object_remove_toggle_ref()");
return NULL; }
else
{
*toggle_notify = tstackptr->toggle_refs[0].notify;
*toggle_data = tstackptr->toggle_refs[0].data;
}
} }
*out_data = tstackptr->toggle_refs[0].data; object_bit_unlock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
return tstackptr->toggle_refs[0].notify;
return success;
} }
/** /**
@ -4148,16 +4177,8 @@ retry:
} }
else if (old_ref == 1) else if (old_ref == 1)
{ {
gboolean do_retry;
/* With ref count 1, check whether we need to emit a toggle notification. */ /* With ref count 1, check whether we need to emit a toggle notification. */
object_bit_lock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS); if (!toggle_refs_check_and_ref_or_deref (object, TRUE, &old_ref, &toggle_notify, &toggle_data))
do_retry = !g_atomic_int_compare_and_exchange_full ((int *) &object->ref_count,
old_ref, old_ref + 1, &old_ref);
if (!do_retry)
toggle_notify = toggle_refs_get_notify_unlocked (object, &toggle_data);
object_bit_unlock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
if (do_retry)
goto retry; goto retry;
} }
else else
@ -4282,7 +4303,6 @@ g_object_unref (gpointer _object)
GToggleNotify toggle_notify; GToggleNotify toggle_notify;
gpointer toggle_data; gpointer toggle_data;
GObjectNotifyQueue *nqueue; GObjectNotifyQueue *nqueue;
gboolean do_retry;
GType obj_gtype; GType obj_gtype;
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
@ -4331,17 +4351,8 @@ retry_beginning:
* *
* We need to take a lock, to avoid races. */ * We need to take a lock, to avoid races. */
object_bit_lock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS); if (!toggle_refs_check_and_ref_or_deref (object, FALSE, &old_ref, &toggle_notify, &toggle_data))
if (!g_atomic_int_compare_and_exchange_full ((int *) &object->ref_count,
old_ref, old_ref - 1, &old_ref))
{
object_bit_unlock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
goto retry_beginning; goto retry_beginning;
}
toggle_notify = toggle_refs_get_notify_unlocked (object, &toggle_data);
object_bit_unlock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
/* Beware: object might be a dangling pointer. */ /* Beware: object might be a dangling pointer. */
TRACE (GOBJECT_OBJECT_UNREF (object, obj_gtype, old_ref)); TRACE (GOBJECT_OBJECT_UNREF (object, obj_gtype, old_ref));
@ -4425,15 +4436,7 @@ retry_decrement:
* notification. Take a lock and check for that. * notification. Take a lock and check for that.
* *
* In that case, we need a lock to get the toggle notification. */ * In that case, we need a lock to get the toggle notification. */
object_bit_lock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS); if (!toggle_refs_check_and_ref_or_deref (object, FALSE, &old_ref, &toggle_notify, &toggle_data))
do_retry = !g_atomic_int_compare_and_exchange_full ((int *) &object->ref_count,
old_ref, old_ref - 1,
&old_ref);
if (!do_retry)
toggle_notify = toggle_refs_get_notify_unlocked (object, &toggle_data);
object_bit_unlock (object, OPTIONAL_BIT_LOCK_TOGGLE_REFS);
if (do_retry)
goto retry_decrement; goto retry_decrement;
/* Beware: object might be a dangling pointer. */ /* Beware: object might be a dangling pointer. */