luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-06 01:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gobject: rework freezing once during object initialization

Browse Source 
During object initialization, we may want to freeze the notifications,
but only do so once (and once unfreeze at the end).

Rework how that was done. We can avoid an additional GData lookup.
This commit is contained in:
Thomas Haller 2024-01-29 11:30:21 +01:00
parent 63aa96adfe
commit f71b2a29a9
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gobject/gobject.c
View File

@ -682,7 +682,8 @@ g_object_notify_queue_freeze_cb (gpointer *data,
GDestroyNotify *destroy_notify, GDestroyNotify *destroy_notify,
gpointer user_data) gpointer user_data)
{ {
GObject *object = user_data; GObject *object = ((gpointer *) user_data)[0];
gboolean freeze_always = GPOINTER_TO_INT (((gpointer *) user_data)[1]);
GObjectNotifyQueue *nqueue = *data; GObjectNotifyQueue *nqueue = *data;
if (!nqueue) if (!nqueue)
@ -692,6 +693,13 @@ g_object_notify_queue_freeze_cb (gpointer *data,
*data = nqueue; *data = nqueue;
*destroy_notify = g_free; *destroy_notify = g_free;
} }
else if (!freeze_always)
{
/* The caller only wants to ensure we are frozen once. If we are already frozen,
* don't freeze another time.
*
* This is only relevant during the object initialization. */
}
else else
{ {
if (nqueue->freeze_count == G_MAXUINT16) if (nqueue->freeze_count == G_MAXUINT16)
@ -709,12 +717,12 @@ g_object_notify_queue_freeze_cb (gpointer *data,
} }
static void static void
g_object_notify_queue_freeze (GObject *object) g_object_notify_queue_freeze (GObject *object, gboolean freeze_always)
{ {
_g_datalist_id_update_atomic (&object->qdata, _g_datalist_id_update_atomic (&object->qdata,
quark_notify_queue, quark_notify_queue,
g_object_notify_queue_freeze_cb, g_object_notify_queue_freeze_cb,
object); ((gpointer[]){ object, GINT_TO_POINTER (!!freeze_always) }));
} }
static gpointer static gpointer
@ -1756,7 +1764,7 @@ g_object_init (GObject *object,
if (CLASS_HAS_PROPS (class) && CLASS_NEEDS_NOTIFY (class)) if (CLASS_HAS_PROPS (class) && CLASS_NEEDS_NOTIFY (class))
{ {
/* freeze object's notification queue, g_object_new_internal() preserves pairedness */ /* freeze object's notification queue, g_object_new_internal() preserves pairedness */
g_object_notify_queue_freeze (object); g_object_notify_queue_freeze (object, TRUE);
} }
/* mark object in-construction for notify_queue_thaw() and to allow construct-only properties */ /* mark object in-construction for notify_queue_thaw() and to allow construct-only properties */
@ -1936,7 +1944,7 @@ g_object_freeze_notify (GObject *object)
} }
#endif #endif
g_object_notify_queue_freeze (object); g_object_notify_queue_freeze (object, TRUE);
} }
static inline void static inline void
@ -2622,8 +2630,7 @@ g_object_new_with_custom_constructor (GObjectClass *class,
/* This may or may not have been setup in g_object_init(). /* This may or may not have been setup in g_object_init().
* If it hasn't, we do it now. * If it hasn't, we do it now.
*/ */
if (!g_datalist_id_get_data (&object->qdata, quark_notify_queue)) g_object_notify_queue_freeze (object, FALSE);
g_object_notify_queue_freeze (object);
nqueue_is_frozen = TRUE; nqueue_is_frozen = TRUE;
} }
} }
@ -2670,8 +2677,7 @@ g_object_new_internal (GObjectClass *class,
/* This may or may not have been setup in g_object_init(). /* This may or may not have been setup in g_object_init().
* If it hasn't, we do it now. * If it hasn't, we do it now.
*/ */
if (!g_datalist_id_get_data (&object->qdata, quark_notify_queue)) g_object_notify_queue_freeze (object, FALSE);
g_object_notify_queue_freeze (object);
nqueue_is_frozen = TRUE; nqueue_is_frozen = TRUE;
} }
@ -3035,7 +3041,7 @@ g_object_constructor (GType type,
/* set construction parameters */ /* set construction parameters */
if (n_construct_properties) if (n_construct_properties)
{ {
g_object_notify_queue_freeze (object); g_object_notify_queue_freeze (object, TRUE);
/* set construct properties */ /* set construct properties */
while (n_construct_properties--) while (n_construct_properties--)
@ -3125,7 +3131,7 @@ g_object_setv (GObject *object,
if (_g_object_has_notify_handler (object)) if (_g_object_has_notify_handler (object))
{ {
g_object_notify_queue_freeze (object); g_object_notify_queue_freeze (object, TRUE);
nqueue_is_frozen = TRUE; nqueue_is_frozen = TRUE;
} }
@ -3169,7 +3175,7 @@ g_object_set_valist (GObject *object,
if (_g_object_has_notify_handler (object)) if (_g_object_has_notify_handler (object))
{ {
g_object_notify_queue_freeze (object); g_object_notify_queue_freeze (object, TRUE);
nqueue_is_frozen = TRUE; nqueue_is_frozen = TRUE;
} }
@ -4468,7 +4474,7 @@ retry_beginning:
* which happens to be the same lock that is also taken by toggle_refs_check_and_ref(), * which happens to be the same lock that is also taken by toggle_refs_check_and_ref(),
* that is very important. See also the code comment in toggle_refs_check_and_ref(). * that is very important. See also the code comment in toggle_refs_check_and_ref().
*/ */
g_object_notify_queue_freeze (object); g_object_notify_queue_freeze (object, TRUE);
nqueue_is_frozen = TRUE; nqueue_is_frozen = TRUE;
TRACE (GOBJECT_OBJECT_DISPOSE (object, G_TYPE_FROM_INSTANCE (object), 1)); TRACE (GOBJECT_OBJECT_DISPOSE (object, G_TYPE_FROM_INSTANCE (object), 1));