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

Keep a count of construct params

Browse Source 
This avoids walking the construct params list
one extra time just to count when constructing
objects, for a small speedup of object construction
in the presence of construct params.
This commit is contained in:
Matthias Clasen
2022-05-26 09:43:41 -04:00
parent cdc5bf0227
commit f7119a7935
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gobject/gobject.c
View File

@@ -478,6 +478,7 @@ g_object_base_class_init (GObjectClass *class)
/* reset instance specific fields and methods that don't get inherited */ /* reset instance specific fields and methods that don't get inherited */
class->construct_properties = pclass ? g_slist_copy (pclass->construct_properties) : NULL; class->construct_properties = pclass ? g_slist_copy (pclass->construct_properties) : NULL;
class->n_construct_properties = g_slist_length (class->construct_properties);
class->get_property = NULL; class->get_property = NULL;
class->set_property = NULL; class->set_property = NULL;
} }
@@ -491,6 +492,7 @@ g_object_base_class_finalize (GObjectClass *class)
g_slist_free (class->construct_properties); g_slist_free (class->construct_properties);
class->construct_properties = NULL; class->construct_properties = NULL;
class->n_construct_properties = 0;
list = g_param_spec_pool_list_owned (pspec_pool, G_OBJECT_CLASS_TYPE (class)); list = g_param_spec_pool_list_owned (pspec_pool, G_OBJECT_CLASS_TYPE (class));
for (node = list; node; node = node->next) for (node = list; node; node = node->next)
{ {
@@ -627,14 +629,20 @@ validate_and_install_class_property (GObjectClass *class,
if (install_property_internal (oclass_type, property_id, pspec)) if (install_property_internal (oclass_type, property_id, pspec))
{ {
if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
{
class->construct_properties = g_slist_append (class->construct_properties, pspec); class->construct_properties = g_slist_append (class->construct_properties, pspec);
class->n_construct_properties += 1;
}
/* for property overrides of construct properties, we have to get rid /* for property overrides of construct properties, we have to get rid
* of the overridden inherited construct property * of the overridden inherited construct property
*/ */
pspec = g_param_spec_pool_lookup (pspec_pool, pspec->name, parent_type, TRUE); pspec = g_param_spec_pool_lookup (pspec_pool, pspec->name, parent_type, TRUE);
if (pspec && pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) if (pspec && pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
{
class->construct_properties = g_slist_remove (class->construct_properties, pspec); class->construct_properties = g_slist_remove (class->construct_properties, pspec);
class->n_construct_properties -= 1;
}
return TRUE; return TRUE;
} }
@@ -1875,7 +1883,6 @@ g_object_new_with_custom_constructor (GObjectClass *class,
GObjectConstructParam *cparams; GObjectConstructParam *cparams;
GObject *object; GObject *object;
GValue *cvalues; GValue *cvalues;
gint n_cparams;
gint cvals_used; gint cvals_used;
GSList *node; GSList *node;
guint i; guint i;
@@ -1891,9 +1898,8 @@ g_object_new_with_custom_constructor (GObjectClass *class,
*/ */
/* Create the array of GObjectConstructParams for constructor() */ /* Create the array of GObjectConstructParams for constructor() */
n_cparams = g_slist_length (class->construct_properties); cparams = g_new (GObjectConstructParam, class->n_construct_properties);
cparams = g_new (GObjectConstructParam, n_cparams); cvalues = g_new0 (GValue, class->n_construct_properties);
cvalues = g_new0 (GValue, n_cparams);
cvals_used = 0; cvals_used = 0;
i = 0; i = 0;
@@ -1934,7 +1940,7 @@ g_object_new_with_custom_constructor (GObjectClass *class,
} }
/* construct object from construction parameters */ /* construct object from construction parameters */
object = class->constructor (class->g_type_class.g_type, n_cparams, cparams); object = class->constructor (class->g_type_class.g_type, class->n_construct_properties, cparams);
/* free construction values */ /* free construction values */
g_free (cparams); g_free (cparams);
while (cvals_used--) while (cvals_used--)

3
gobject/gobject.h
View File

@@ -369,8 +369,9 @@ struct _GObjectClass
/*< private >*/ /*< private >*/
gsize flags; gsize flags;
gsize n_construct_properties;
/* padding */ /* padding */
gpointer pdummy[6]; gpointer pdummy[5];
}; };
/** /**