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

gobject: rework g_object_notify_queue_thaw() to use g_datalist_id_update_atomic()

Browse Source 
The goal is to drop OPTIONAL_BIT_LOCK_NOTIFY lock. This is one step.
Move code inside g_datalist_id_update_atomic().
This commit is contained in:
Thomas Haller 2024-01-28 12:56:47 +01:00
parent 626b6518b3
commit 5d81e243d4
1 changed files with 65 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
gobject/gobject.c
View File

@ -724,60 +724,88 @@ g_object_notify_queue_freeze (GObject *object)
return nqueue; return nqueue;
} }
static void static gpointer
g_object_notify_queue_thaw (GObject *object, g_object_notify_queue_thaw_cb (gpointer *data,
GObjectNotifyQueue *nqueue, GDestroyNotify *destroy_notify,
gboolean take_ref) gpointer user_data)
{ {
GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL; GObject *object = ((gpointer *) user_data)[0];
GSList *slist; GObjectNotifyQueue *nqueue0 = ((gpointer *) user_data)[1];
guint n_pspecs = 0; GObjectNotifyQueue *nqueue = *data;
object_bit_lock (object, OPTIONAL_BIT_LOCK_NOTIFY); #if G_ENABLE_DEBUG
g_assert (!nqueue0 || nqueue0 == nqueue);
#endif
(void) nqueue0;
if (!nqueue)
{
/* Caller didn't look up the queue yet. Do it now. */
nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
}
/* Just make sure we never get into some nasty race condition */
if (G_UNLIKELY (!nqueue || nqueue->freeze_count == 0)) if (G_UNLIKELY (!nqueue || nqueue->freeze_count == 0))
{ {
object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
g_critical ("%s: property-changed notification for %s(%p) is not frozen", g_critical ("%s: property-changed notification for %s(%p) is not frozen",
G_STRFUNC, G_OBJECT_TYPE_NAME (object), object); G_STRFUNC, G_OBJECT_TYPE_NAME (object), object);
return; return NULL;
} }
nqueue->freeze_count--; nqueue->freeze_count--;
if (nqueue->freeze_count)
{
object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
return;
}
pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem; if (nqueue->freeze_count > 0)
return NULL;
for (slist = nqueue->pspecs; slist; slist = slist->next) *data = NULL;
{ return nqueue;
pspecs[n_pspecs++] = slist->data; }
}
g_datalist_id_set_data (&object->qdata, quark_notify_queue, NULL); static void
g_object_notify_queue_thaw (GObject *object,
GObjectNotifyQueue *nqueue,
gboolean take_ref)
{
GParamSpec *pspecs_stack[16];
GParamSpec **pspecs_heap = NULL;
GParamSpec **pspecs = pspecs_stack;
guint n_pspecs;
GSList *slist;
object_bit_lock (object, OPTIONAL_BIT_LOCK_NOTIFY);
nqueue = _g_datalist_id_update_atomic (&object->qdata,
quark_notify_queue,
g_object_notify_queue_thaw_cb,
((gpointer[]){ object, nqueue }));
object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY); object_bit_unlock (object, OPTIONAL_BIT_LOCK_NOTIFY);
if (n_pspecs) if (!nqueue)
return;
if (nqueue->n_pspecs == 0)
goto out;
if (nqueue->n_pspecs > G_N_ELEMENTS (pspecs_stack))
{ {
if (take_ref) pspecs_heap = g_new (GParamSpec *, nqueue->n_pspecs);
g_object_ref (object); pspecs = pspecs_heap;
G_OBJECT_GET_CLASS (object)->dispatch_properties_changed (object, n_pspecs, pspecs);
if (take_ref)
g_object_unref (object);
} }
g_free (free_me);
n_pspecs = 0;
for (slist = nqueue->pspecs; slist; slist = slist->next)
pspecs[n_pspecs++] = slist->data;
#if G_ENABLE_DEBUG
g_assert (n_pspecs == nqueue->n_pspecs);
#endif
if (take_ref)
g_object_ref (object);
G_OBJECT_GET_CLASS (object)->dispatch_properties_changed (object, n_pspecs, pspecs);
if (take_ref)
g_object_unref (object);
if (pspecs_heap)
g_free (pspecs_heap);
out:
g_object_notify_queue_free (nqueue);
} }
static gboolean static gboolean