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

Avoid property notification during object construction

Browse Source 
Check whether an object has a nontrivial notify vfunc
and avoid creating and updating the notify queue if
it doesn't. We know that there can be no notify signal
handlers at this point. No need to notify if nobody's
listening.
This commit is contained in:
Matthias Clasen 2022-05-15 07:53:46 -04:00
parent 8b328f1d6d
commit 8851112b8d
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gobject/gobject.c
View File

@ -1158,9 +1158,9 @@ g_object_init (GObject *object,
object->ref_count = 1;
object->qdata = NULL;
if (CLASS_HAS_PROPS (class))
if (CLASS_HAS_PROPS (class) && CLASS_HAS_NOTIFY (class))
{
/* freeze object's notification queue, g_object_newv() preserves pairedness */
/* freeze object's notification queue, g_object_new_internal() preserves pairedness */
g_object_notify_queue_freeze (object, FALSE);
}
@ -1653,7 +1653,8 @@ object_set_property (GObject *object,
g_value_unset (&tmp_value);
}
if ((pspec->flags & (G_PARAM_EXPLICIT_NOTIFY|G_PARAM_READABLE)) == G_PARAM_READABLE)
if ((pspec->flags & (G_PARAM_EXPLICIT_NOTIFY | G_PARAM_READABLE)) == G_PARAM_READABLE &&
nqueue != NULL)
g_object_notify_queue_add (object, nqueue, pspec);
}
@ -2060,6 +2061,7 @@ g_object_new_internal (GObjectClass *class,
{
GObjectNotifyQueue *nqueue = NULL;
GObject *object;
guint i;
if G_UNLIKELY (CLASS_HAS_CUSTOM_CONSTRUCTOR (class))
return g_object_new_with_custom_constructor (class, params, n_params);
@ -2072,9 +2074,12 @@ g_object_new_internal (GObjectClass *class,
{
GSList *node;
/* This will have been setup in g_object_init() */
nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
g_assert (nqueue != NULL);
if (CLASS_HAS_NOTIFY (class))
{
/* This will have been setup in g_object_init() */
nqueue = g_datalist_id_get_data (&object->qdata, quark_notify_queue);
g_assert (nqueue != NULL);
}
/* We will set exactly n_construct_properties construct
* properties, but they may come from either the class default
@ -2107,20 +2112,15 @@ g_object_new_internal (GObjectClass *class,
if (CLASS_HAS_CUSTOM_CONSTRUCTED (class))
class->constructed (object);
/* Set remaining properties. The construct properties will
* already have been taken, so set only the non-construct ones.
*/
for (i = 0; i < n_params; i++)
if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)))
object_set_property (object, params[i].pspec, params[i].value, nqueue);
if (nqueue)
{
guint i;
/* Set remaining properties. The construct properties will
* already have been taken, so set only the non-construct
* ones.
*/
for (i = 0; i < n_params; i++)
if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)))
object_set_property (object, params[i].pspec, params[i].value, nqueue);
g_object_notify_queue_thaw (object, nqueue);
}
g_object_notify_queue_thaw (object, nqueue);
return object;
}