luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-26 02:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow copying the enumeration values when registering types

Browse Source 
The existing API for registering enumeration types requires that the
GEnumValue and GFlagsValue arrays that describe the enumeration values
is located in static storage. This causes unnecessary relocations, and
does not save that much memory, compared to the rest of GType.

We can provide a new API, to be used by developers, to copy the
enumeration values, and thus drop the ones they have from static
storage.
This commit is contained in:
Emmanuele Bassi
2017-07-19 18:32:54 +01:00
parent 2ac8079b94
commit 5a82f45432
2 changed files with 110 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
gobject/genums.c
View File

@@ -217,6 +217,56 @@ g_enum_register_static (const gchar *name,
return type;
}
/**
* g_enum_type_register_static:
* @name: A nul-terminated string used as the name of the new type.
* @values: An array of #GEnumValue structs for the possible
* enumeration values. The array is terminated by a struct with all
* members being 0. GObject will copy the data.
*
* Registers a new static enumeration type with the name @name.
*
* It is normally more convenient to let [glib-mkenums][glib-mkenums],
* generate a my_enum_get_type() function from a usual C enumeration
* definition than to write one yourself using g_enum_register_static().
*
* Returns: The new type identifier.
*
* Since: 2.54
*/
GType
g_enum_type_register_static (const gchar *name,
const GEnumValue *values)
{
GTypeInfo enum_type_info = {
sizeof (GEnumClass), /* class_size */
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) g_enum_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
0, /* instance_size */
0, /* n_preallocs */
NULL, /* instance_init */
NULL, /* value_table */
};
const GEnumValue *iter;
guint n_values = 0;
GType type;
g_return_val_if_fail (name != NULL, 0);
g_return_val_if_fail (values != NULL, 0);
for (iter = values; iter->value_name; iter++)
n_values += 1;
enum_type_info.class_data = g_memdup (values, n_values * sizeof (GEnumValue));
type = g_type_register_static (G_TYPE_ENUM, name, &enum_type_info, 0);
return type;
}
/**
* g_flags_register_static:
* @name: A nul-terminated string used as the name of the new type.
@@ -252,11 +302,61 @@ g_flags_register_static (const gchar *name,
g_return_val_if_fail (name != NULL, 0);
g_return_val_if_fail (const_static_values != NULL, 0);
flags_type_info.class_data = const_static_values;
type = g_type_register_static (G_TYPE_FLAGS, name, &flags_type_info, 0);
return type;
}
/**
* g_flags_type_register_static:
* @name: A nul-terminated string used as the name of the new type.
* @values: An array of #GFlagsValue structs for the possible flags
* values. The array is terminated by a struct with all members
* being 0. GObject copies the data
*
* Registers a new static flags type with the name @name.
*
* It is normally more convenient to let [glib-mkenums][glib-mkenums]
* generate a my_flags_get_type() function from a usual C enumeration
* definition than to write one yourself using g_flags_register_static().
*
* Returns: The new type identifier.
*
* Since: 2.54
*/
GType
g_flags_type_register_static (const gchar *name,
const GFlagsValue *values)
{
GTypeInfo flags_type_info = {
sizeof (GFlagsClass), /* class_size */
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) g_flags_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
0, /* instance_size */
0, /* n_preallocs */
NULL, /* instance_init */
NULL, /* value_table */
};
const GFlagsValue *iter;
guint n_values = 0;
GType type;
g_return_val_if_fail (name != NULL, 0);
g_return_val_if_fail (values != NULL, 0);
for (iter = values; iter->value_name != NULL; iter++)
n_values += 1;
flags_type_info.class_data = g_memdup (values, n_values * sizeof (GFlagsValue));
type = g_type_register_static (G_TYPE_FLAGS, name, &flags_type_info, 0);
return type;
}

8
gobject/genums.h
View File

@@ -262,6 +262,14 @@ GType g_enum_register_static (const gchar *name,
GLIB_AVAILABLE_IN_ALL
GType g_flags_register_static (const gchar *name,
const GFlagsValue *const_static_values);
GLIB_AVAILABLE_IN_2_54
GType g_enum_type_register_static (const gchar *name,
const GEnumValue *values);
GLIB_AVAILABLE_IN_2_54
GType g_flags_type_register_static (const gchar *name,
const GFlagsValue *values);
/* functions to complete the type information
* for enums/flags implemented by plugins
*/