luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

provide G_TYPE_FUNDAMENTAL_SHIFT and g_type_fundamental_next() to return

Browse Source 
Thu Nov 22 00:26:26 2001  Tim Janik  <timj@gtk.org>

        * gtype.[hc]: provide G_TYPE_FUNDAMENTAL_SHIFT and
        g_type_fundamental_next() to return next usable fundamental
        type. use TypeNode pointers as type IDs.
This commit is contained in:
Tim Janik 2001-11-21 23:48:19 +00:00 committed by Tim Janik
parent 2410616200
commit 0d14682569
6 changed files with 135 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gobject/gobject-sections.txt
View File

@ -78,7 +78,8 @@ g_type_add_interface_dynamic
g_type_interface_add_prerequisite g_type_interface_add_prerequisite
g_type_get_plugin g_type_get_plugin
g_type_interface_get_plugin g_type_interface_get_plugin
g_type_fundamental_last g_type_fundamental_next
g_type_fundamental
g_type_create_instance g_type_create_instance
g_type_free_instance g_type_free_instance
g_type_add_class_cache_func g_type_add_class_cache_func

7
docs/reference/gobject/tmpl/gobject-unused.sgml
View File

@ -195,6 +195,13 @@ macro.
@is_a_type: @is_a_type:
@Returns: @Returns:
<!-- ##### FUNCTION g_type_fundamental_last ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION g_type_instance_is_a ##### --> <!-- ##### FUNCTION g_type_instance_is_a ##### -->
<para> <para>
Determines if @instance adheres to the interface exported Determines if @instance adheres to the interface exported

33
docs/reference/gobject/tmpl/gtype.sgml
View File

@ -82,10 +82,7 @@ for types that are assigned at compile-time.
<!-- ##### MACRO G_TYPE_FUNDAMENTAL_LAST ##### --> <!-- ##### MACRO G_TYPE_FUNDAMENTAL_LAST ##### -->
<para> <para>
An integer that currently represents the highest value of all
fundamental type identifiers. This is of interest for dynamic
introduction of new fundamental types (a
<emphasis>rarely</emphasis> needed feature).
</para> </para>
@ -199,9 +196,11 @@ The predefined identifiers of the reserved fundamental types.
@G_TYPE_BOXED: Identifier for the "#GBoxed" type. @G_TYPE_BOXED: Identifier for the "#GBoxed" type.
@G_TYPE_PARAM: Identifier for the "#GParam" type. @G_TYPE_PARAM: Identifier for the "#GParam" type.
@G_TYPE_OBJECT: Identifier for the "#GObject" type. @G_TYPE_OBJECT: Identifier for the "#GObject" type.
@G_TYPE_RESERVED_GLIB_FIRST:
@G_TYPE_RESERVED_GLIB_LAST:
@G_TYPE_RESERVED_BSE_FIRST: First fundamental type ID reserved for BSE. @G_TYPE_RESERVED_BSE_FIRST: First fundamental type ID reserved for BSE.
@G_TYPE_RESERVED_BSE_LAST: Last fundamental type ID reserved for BSE. @G_TYPE_RESERVED_BSE_LAST: Last fundamental type ID reserved for BSE.
@G_TYPE_RESERVED_LAST_FUNDAMENTAL: Last reserved fundamental type ID. @G_TYPE_RESERVED_USER_FIRST:
<!-- ##### STRUCT GTypeInterface ##### --> <!-- ##### STRUCT GTypeInterface ##### -->
<para> <para>
@ -1105,13 +1104,27 @@ Returns the the #GTypePlugin structure for @type or
@Returns: @Returns:
<!-- ##### FUNCTION g_type_fundamental_last ##### --> <!-- ##### FUNCTION g_type_fundamental_next ##### -->
<para> <para>
Returns the last fundamental type which is registered plus one, Returns the next free fundamental type id which can be used to
i.e. the next fundamental type ID that may be registered. register a new fundamental type with g_type_register_fundamental().
The returned type ID represents the highest currently registered
fundamental type identifier.
</para> </para>
@Returns: The nextmost not registered fundamental type ID. @Returns: The nextmost fundamental type ID to be registered,
or 0 if the type system ran out of fundamental type IDs.
<!-- ##### FUNCTION g_type_fundamental ##### -->
<para>
Internal function, used to extract the fundamental type ID portion.
use G_TYPE_FUNDAMENTAL() instead.
</para>
@type_id: valid type ID
@Returns: fundamental type ID
<!-- ##### FUNCTION g_type_create_instance ##### --> <!-- ##### FUNCTION g_type_create_instance ##### -->
@ -1119,7 +1132,7 @@ i.e. the next fundamental type ID that may be registered.
Creates and initializes an instance of @type if @type is valid and can Creates and initializes an instance of @type if @type is valid and can
be instantiated. The type system only performs basic allocation and be instantiated. The type system only performs basic allocation and
structure setups for instances, actual instance creation should happen structure setups for instances, actual instance creation should happen
through functions supplied by the types fundamental type implementation. through functions supplied by the type's fundamental type implementation.
So use of g_type_create_instance() is reserved for implementators of So use of g_type_create_instance() is reserved for implementators of
fundamental types only. E.g. instances of the #GObject hierarchy fundamental types only. E.g. instances of the #GObject hierarchy
should be created via g_object_new() and <emphasis>never</emphasis> should be created via g_object_new() and <emphasis>never</emphasis>

8
gobject/ChangeLog
View File

@ -1,3 +1,9 @@
Thu Nov 22 00:26:26 2001 Tim Janik <timj@gtk.org>
* gtype.[hc]: provide G_TYPE_FUNDAMENTAL_SHIFT and
g_type_fundamental_next() to return next usable fundamental
type. use TypeNode pointers as type IDs.
2001-11-22 Tor Lillqvist <tml@iki.fi> 2001-11-22 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in Makefile.am. * makefile.mingw.in (DEFINES): Set G_LOG_DOMAIN as in Makefile.am.
@ -19,7 +25,7 @@ Wed Nov 21 17:23:33 2001 Tim Janik <timj@gtk.org>
G_TYPE_GSTRING. G_TYPE_GSTRING.
* gtype.h: removed fundamental branch APIs and derived enum * gtype.h: removed fundamental branch APIs and derived enum
values. values. define GType as gsize.
2001-11-19 jacob berkman <jacob@ximian.com> 2001-11-19 jacob berkman <jacob@ximian.com>

136
gobject/gtype.c
View File

@ -163,8 +163,9 @@ struct _TypeNode
#define MAX_N_PREREQUISITES (MAX_N_IFACES) #define MAX_N_PREREQUISITES (MAX_N_IFACES)
#define NODE_TYPE(node) (node->supers[0]) #define NODE_TYPE(node) (node->supers[0])
#define NODE_PARENT_TYPE(node) (node->supers[1]) #define NODE_PARENT_TYPE(node) (node->supers[1])
#define NODE_FUNDAMENTAL_TYPE(node) (node->supers[node->n_supers])
#define NODE_NAME(node) (g_quark_to_string (node->qname)) #define NODE_NAME(node) (g_quark_to_string (node->qname))
#define NODE_IS_IFACE(node) (G_TYPE_IS_INTERFACE (NODE_TYPE (node))) #define NODE_IS_IFACE(node) (NODE_FUNDAMENTAL_TYPE (node) == G_TYPE_INTERFACE)
#define CLASSED_NODE_N_IFACES(node) ((node)->_prot_n_ifaces_prerequisites) #define CLASSED_NODE_N_IFACES(node) ((node)->_prot_n_ifaces_prerequisites)
#define CLASSED_NODE_IFACES_ENTRIES(node) ((node)->_prot.iface_entries) #define CLASSED_NODE_IFACES_ENTRIES(node) ((node)->_prot.iface_entries)
#define IFACE_NODE_N_PREREQUISITES(node) ((node)->_prot_n_ifaces_prerequisites) #define IFACE_NODE_N_PREREQUISITES(node) ((node)->_prot_n_ifaces_prerequisites)
@ -173,6 +174,7 @@ struct _TypeNode
#define iface_node_set_holders_W(node, holders) (type_set_qdata_W ((node), static_quark_iface_holder, (holders))) #define iface_node_set_holders_W(node, holders) (type_set_qdata_W ((node), static_quark_iface_holder, (holders)))
#define iface_node_get_dependants_array_L(n) ((GType*) type_get_qdata_L ((n), static_quark_dependants_array)) #define iface_node_get_dependants_array_L(n) ((GType*) type_get_qdata_L ((n), static_quark_dependants_array))
#define iface_node_set_dependants_array_W(n,d) (type_set_qdata_W ((n), static_quark_dependants_array, (d))) #define iface_node_set_dependants_array_W(n,d) (type_set_qdata_W ((n), static_quark_dependants_array, (d)))
#define FUNDAMENTAL_FLAG_MASK ((1 << G_TYPE_FUNDAMENTAL_SHIFT) - 1)
struct _IFaceHolder struct _IFaceHolder
{ {
@ -240,7 +242,6 @@ typedef struct {
/* --- variables --- */ /* --- variables --- */
static guint static_n_class_cache_funcs = 0; static guint static_n_class_cache_funcs = 0;
static ClassCacheFunc *static_class_cache_funcs = NULL; static ClassCacheFunc *static_class_cache_funcs = NULL;
static GType static_last_fundamental_id = 0;
static GQuark static_quark_type_flags = 0; static GQuark static_quark_type_flags = 0;
static GQuark static_quark_iface_holder = 0; static GQuark static_quark_iface_holder = 0;
static GQuark static_quark_dependants_array = 0; static GQuark static_quark_dependants_array = 0;
@ -249,20 +250,16 @@ GTypeDebugFlags _g_type_debug_flags = 0;
/* --- type nodes --- */ /* --- type nodes --- */
static GHashTable *static_type_nodes_ht = NULL; static GHashTable *static_type_nodes_ht = NULL;
static GType *static_branch_seqnos = NULL; static TypeNode *static_fundamental_type_nodes[(G_TYPE_FUNDAMENTAL_MAX >> 1) + 1] = { 0, };
static TypeNode ***static_type_nodes = NULL; static GType static_fundamental_next = G_TYPE_RESERVED_USER_FIRST;
static inline TypeNode* static inline TypeNode*
lookup_type_node_L (register GType utype) lookup_type_node_L (register GType utype)
{ {
#define G_TYPE_BRANCH_SEQNO(type) ((type) >> 8) if (utype <= G_TYPE_FUNDAMENTAL_MAX)
register GType ftype = G_TYPE_FUNDAMENTAL (utype); return static_fundamental_type_nodes[utype >> 1];
register GType b_seqno = G_TYPE_BRANCH_SEQNO (utype);
if (ftype < static_last_fundamental_id && b_seqno < static_branch_seqnos[ftype])
return static_type_nodes[ftype][b_seqno];
else else
return NULL; return (TypeNode*) (utype & ~FUNDAMENTAL_FLAG_MASK);
} }
static TypeNode* static TypeNode*
@ -272,26 +269,28 @@ type_node_any_new_W (TypeNode *pnode,
GTypePlugin *plugin, GTypePlugin *plugin,
GTypeFundamentalFlags type_flags) GTypeFundamentalFlags type_flags)
{ {
guint branch_last, n_supers; guint n_supers;
GType type; GType type;
TypeNode *node; TypeNode *node;
guint i, node_size = 0; guint i, node_size = 0;
n_supers = pnode ? pnode->n_supers + 1 : 0; n_supers = pnode ? pnode->n_supers + 1 : 0;
branch_last = static_branch_seqnos[ftype]++;
type = ftype | (branch_last << 8); // FIXME: G_TYPE_DERIVE_ID (ftype, branch_last);
g_assert ((type & G_TYPE_FLAG_RESERVED_ID_BIT) == 0);
if (!branch_last || g_bit_storage (branch_last - 1) < g_bit_storage (static_branch_seqnos[ftype] - 1))
static_type_nodes[ftype] = g_renew (TypeNode*, static_type_nodes[ftype], 1 << g_bit_storage (static_branch_seqnos[ftype] - 1));
if (!pnode) if (!pnode)
node_size += SIZEOF_FUNDAMENTAL_INFO; /* fundamental type info */ node_size += SIZEOF_FUNDAMENTAL_INFO; /* fundamental type info */
node_size += SIZEOF_BASE_TYPE_NODE (); /* TypeNode structure */ node_size += SIZEOF_BASE_TYPE_NODE (); /* TypeNode structure */
node_size += (sizeof (GType) * (1 + n_supers + 1)); /* self + ancestors + 0 for ->supers[] */ node_size += (sizeof (GType) * (1 + n_supers + 1)); /* self + ancestors + (0) for ->supers[] */
node = g_malloc0 (node_size); node = g_malloc0 (node_size);
if (!pnode) /* offset fundamental types */ if (!pnode) /* offset fundamental types */
node = G_STRUCT_MEMBER_P (node, SIZEOF_FUNDAMENTAL_INFO); {
static_type_nodes[ftype][branch_last] = node; node = G_STRUCT_MEMBER_P (node, SIZEOF_FUNDAMENTAL_INFO);
static_fundamental_type_nodes[ftype >> 1] = node;
type = ftype;
}
else
type = (GType) node;
g_assert ((type & FUNDAMENTAL_FLAG_MASK) == 0);
node->n_supers = n_supers; node->n_supers = n_supers;
if (!pnode) if (!pnode)
@ -359,12 +358,12 @@ type_node_any_new_W (TypeNode *pnode,
static inline GTypeFundamentalInfo* static inline GTypeFundamentalInfo*
type_node_fundamental_info_L (TypeNode *node) type_node_fundamental_info_L (TypeNode *node)
{ {
GType ftype = G_TYPE_FUNDAMENTAL (NODE_TYPE (node)); GType ftype = NODE_FUNDAMENTAL_TYPE (node);
if (ftype != NODE_TYPE (node)) if (ftype != NODE_TYPE (node))
node = lookup_type_node_L (ftype); node = lookup_type_node_L (ftype);
return node ? G_STRUCT_MEMBER_P (node, - SIZEOF_FUNDAMENTAL_INFO) : NULL; return node ? G_STRUCT_MEMBER_P (node, -SIZEOF_FUNDAMENTAL_INFO) : NULL;
} }
static TypeNode* static TypeNode*
@ -374,27 +373,15 @@ type_node_fundamental_new_W (GType ftype,
{ {
GTypeFundamentalInfo *finfo; GTypeFundamentalInfo *finfo;
TypeNode *node; TypeNode *node;
guint i, flast;
flast = static_last_fundamental_id; g_assert ((ftype & FUNDAMENTAL_FLAG_MASK) == 0);
g_assert (ftype <= G_TYPE_FUNDAMENTAL_MAX);
g_assert (ftype == G_TYPE_FUNDAMENTAL (ftype)); if (ftype == static_fundamental_next)
static_fundamental_next += 1 << G_TYPE_FUNDAMENTAL_SHIFT;
type_flags &= TYPE_FUNDAMENTAL_FLAG_MASK; type_flags &= TYPE_FUNDAMENTAL_FLAG_MASK;
static_last_fundamental_id = MAX (static_last_fundamental_id, ftype + 1);
if (static_last_fundamental_id > flast)
{
static_type_nodes = g_renew (TypeNode**, static_type_nodes, static_last_fundamental_id);
static_branch_seqnos = g_renew (GType, static_branch_seqnos, static_last_fundamental_id);
for (i = flast; i < static_last_fundamental_id; i++)
{
static_type_nodes[i] = NULL;
static_branch_seqnos[i] = 0;
}
}
g_assert (static_branch_seqnos[ftype] == 0);
node = type_node_any_new_W (NULL, ftype, name, NULL, type_flags); node = type_node_any_new_W (NULL, ftype, name, NULL, type_flags);
finfo = type_node_fundamental_info_L (node); finfo = type_node_fundamental_info_L (node);
@ -413,7 +400,7 @@ type_node_new_W (TypeNode *pnode,
g_assert (pnode->n_supers < MAX_N_SUPERS); g_assert (pnode->n_supers < MAX_N_SUPERS);
g_assert (pnode->n_children < MAX_N_CHILDREN); g_assert (pnode->n_children < MAX_N_CHILDREN);
return type_node_any_new_W (pnode, G_TYPE_FUNDAMENTAL (NODE_TYPE (pnode)), name, plugin, 0); return type_node_any_new_W (pnode, NODE_FUNDAMENTAL_TYPE (pnode), name, plugin, 0);
} }
static inline IFaceEntry* static inline IFaceEntry*
@ -603,7 +590,7 @@ check_derivation_U (GType parent_type,
return FALSE; return FALSE;
} }
/* ensure deep derivability */ /* ensure deep derivability */
if (parent_type != G_TYPE_FUNDAMENTAL (parent_type) && if (parent_type != NODE_FUNDAMENTAL_TYPE (pnode) &&
!(finfo->type_flags & G_TYPE_FLAG_DEEP_DERIVABLE)) !(finfo->type_flags & G_TYPE_FLAG_DEEP_DERIVABLE))
{ {
G_READ_UNLOCK (&type_rw_lock); G_READ_UNLOCK (&type_rw_lock);
@ -700,7 +687,9 @@ check_type_info_L (TypeNode *pnode,
const GTypeInfo *info) const GTypeInfo *info)
{ {
GTypeFundamentalInfo *finfo = type_node_fundamental_info_L (lookup_type_node_L (ftype)); GTypeFundamentalInfo *finfo = type_node_fundamental_info_L (lookup_type_node_L (ftype));
gboolean is_interface = G_TYPE_IS_INTERFACE (ftype); gboolean is_interface = ftype == G_TYPE_INTERFACE;
g_assert (ftype <= G_TYPE_FUNDAMENTAL_MAX && !(ftype & FUNDAMENTAL_FLAG_MASK));
/* check instance members */ /* check instance members */
if (!(finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) && if (!(finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) &&
@ -1010,7 +999,7 @@ type_data_ref_Wm (TypeNode *node)
if (node->data) if (node->data)
INVALID_RECURSION ("g_type_plugin_*", node->plugin, NODE_NAME (node)); INVALID_RECURSION ("g_type_plugin_*", node->plugin, NODE_NAME (node));
check_type_info_L (pnode, G_TYPE_FUNDAMENTAL (NODE_TYPE (node)), NODE_NAME (node), &tmp_info); check_type_info_L (pnode, NODE_FUNDAMENTAL_TYPE (node), NODE_NAME (node), &tmp_info);
type_data_make_W (node, &tmp_info, type_data_make_W (node, &tmp_info,
check_value_table_I (NODE_NAME (node), check_value_table_I (NODE_NAME (node),
&tmp_value_table) ? &tmp_value_table : NULL); &tmp_value_table) ? &tmp_value_table : NULL);
@ -1155,7 +1144,7 @@ g_type_interface_add_prerequisite (GType interface_type,
TypeNode *iface, *prerequisite_node; TypeNode *iface, *prerequisite_node;
IFaceHolder *holders; IFaceHolder *holders;
g_return_if_fail (G_TYPE_IS_INTERFACE (interface_type)); g_return_if_fail (G_TYPE_IS_INTERFACE (interface_type)); /* G_TYPE_IS_INTERFACE() is an external call: _U */
g_return_if_fail (!g_type_is_a (interface_type, prerequisite_type)); g_return_if_fail (!g_type_is_a (interface_type, prerequisite_type));
g_return_if_fail (!g_type_is_a (prerequisite_type, interface_type)); g_return_if_fail (!g_type_is_a (prerequisite_type, interface_type));
@ -1569,7 +1558,7 @@ type_data_finalize_class_ifaces_Wm (TypeNode *node)
g_assert (node->is_instantiatable && node->data && node->data->class.class && node->data->common.ref_count == 0); g_assert (node->is_instantiatable && node->data && node->data->class.class && node->data->common.ref_count == 0);
g_message ("finalizing interfaces for %sClass `%s'", g_message ("finalizing interfaces for %sClass `%s'",
type_descriptive_name_L (G_TYPE_FUNDAMENTAL (NODE_TYPE (node))), type_descriptive_name_L (NODE_FUNDAMENTAL_TYPE (node)),
type_descriptive_name_L (NODE_TYPE (node))); type_descriptive_name_L (NODE_TYPE (node)));
for (entry = NULL, i = 0; i < CLASSED_NODE_N_IFACES (node); i++) for (entry = NULL, i = 0; i < CLASSED_NODE_N_IFACES (node); i++)
@ -1761,7 +1750,7 @@ g_type_register_fundamental (GType type_id,
GTypeFundamentalInfo *node_finfo; GTypeFundamentalInfo *node_finfo;
TypeNode *node; TypeNode *node;
g_return_val_if_uninitialized (static_last_fundamental_id, g_type_init, 0); g_return_val_if_uninitialized (static_quark_type_flags, g_type_init, 0);
g_return_val_if_fail (type_id > 0, 0); g_return_val_if_fail (type_id > 0, 0);
g_return_val_if_fail (type_name != NULL, 0); g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (info != NULL, 0); g_return_val_if_fail (info != NULL, 0);
@ -1769,9 +1758,10 @@ g_type_register_fundamental (GType type_id,
if (!check_type_name_U (type_name)) if (!check_type_name_U (type_name))
return 0; return 0;
if (G_TYPE_FUNDAMENTAL (type_id) != type_id) if ((type_id & FUNDAMENTAL_FLAG_MASK) ||
type_id > G_TYPE_FUNDAMENTAL_MAX)
{ {
g_warning ("cannot register fundamental type `%s' with non-fundamental id (%u)", g_warning ("attempt to register fundamental type `%s' with invalid type id (%u)",
type_name, type_name,
type_id); type_id);
return 0; return 0;
@ -1797,7 +1787,7 @@ g_type_register_fundamental (GType type_id,
node_finfo = type_node_fundamental_info_L (node); node_finfo = type_node_fundamental_info_L (node);
type_add_flags_W (node, flags); type_add_flags_W (node, flags);
if (check_type_info_L (NULL, G_TYPE_FUNDAMENTAL (NODE_TYPE (node)), type_name, info)) if (check_type_info_L (NULL, NODE_FUNDAMENTAL_TYPE (node), type_name, info))
type_data_make_W (node, info, type_data_make_W (node, info,
check_value_table_I (type_name, info->value_table) ? info->value_table : NULL); check_value_table_I (type_name, info->value_table) ? info->value_table : NULL);
G_WRITE_UNLOCK (&type_rw_lock); G_WRITE_UNLOCK (&type_rw_lock);
@ -1814,7 +1804,7 @@ g_type_register_static (GType parent_type,
TypeNode *pnode, *node; TypeNode *pnode, *node;
GType type = 0; GType type = 0;
g_return_val_if_uninitialized (static_last_fundamental_id, g_type_init, 0); g_return_val_if_uninitialized (static_quark_type_flags, g_type_init, 0);
g_return_val_if_fail (parent_type > 0, 0); g_return_val_if_fail (parent_type > 0, 0);
g_return_val_if_fail (type_name != NULL, 0); g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (info != NULL, 0); g_return_val_if_fail (info != NULL, 0);
@ -1832,7 +1822,7 @@ g_type_register_static (GType parent_type,
G_WRITE_LOCK (&type_rw_lock); G_WRITE_LOCK (&type_rw_lock);
pnode = lookup_type_node_L (parent_type); pnode = lookup_type_node_L (parent_type);
type_data_ref_Wm (pnode); type_data_ref_Wm (pnode);
if (check_type_info_L (pnode, G_TYPE_FUNDAMENTAL (parent_type), type_name, info)) if (check_type_info_L (pnode, NODE_FUNDAMENTAL_TYPE (pnode), type_name, info))
{ {
node = type_node_new_W (pnode, type_name, NULL); node = type_node_new_W (pnode, type_name, NULL);
type_add_flags_W (node, flags); type_add_flags_W (node, flags);
@ -1854,7 +1844,7 @@ g_type_register_dynamic (GType parent_type,
TypeNode *pnode, *node; TypeNode *pnode, *node;
GType type; GType type;
g_return_val_if_uninitialized (static_last_fundamental_id, g_type_init, 0); g_return_val_if_uninitialized (static_quark_type_flags, g_type_init, 0);
g_return_val_if_fail (parent_type > 0, 0); g_return_val_if_fail (parent_type > 0, 0);
g_return_val_if_fail (type_name != NULL, 0); g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (plugin != NULL, 0); g_return_val_if_fail (plugin != NULL, 0);
@ -2125,7 +2115,7 @@ g_type_name (GType type)
{ {
TypeNode *node; TypeNode *node;
g_return_val_if_uninitialized (static_last_fundamental_id, g_type_init, NULL); g_return_val_if_uninitialized (static_quark_type_flags, g_type_init, NULL);
G_READ_LOCK (&type_rw_lock); G_READ_LOCK (&type_rw_lock);
node = lookup_type_node_L (type); node = lookup_type_node_L (type);
@ -2254,19 +2244,6 @@ g_type_is_a (GType type,
return is_a; return is_a;
} }
guint
_g_type_fundamental_branch_last (GType type)
{
GType ftype = G_TYPE_FUNDAMENTAL (type);
guint last_type;
G_READ_LOCK (&type_rw_lock);
last_type = ftype < static_last_fundamental_id ? static_branch_seqnos[ftype] : 0;
G_READ_UNLOCK (&type_rw_lock);
return last_type;
}
GType* /* free result */ GType* /* free result */
g_type_children (GType type, g_type_children (GType type,
guint *n_children) guint *n_children)
@ -2556,7 +2533,7 @@ g_type_interface_get_plugin (GType instance_type,
TypeNode *node; TypeNode *node;
TypeNode *iface; TypeNode *iface;
g_return_val_if_fail (G_TYPE_IS_INTERFACE (interface_type), NULL); g_return_val_if_fail (G_TYPE_IS_INTERFACE (interface_type), NULL); /* G_TYPE_IS_INTERFACE() is an external call: _U */
G_READ_LOCK (&type_rw_lock); G_READ_LOCK (&type_rw_lock);
node = lookup_type_node_L (instance_type); node = lookup_type_node_L (instance_type);
@ -2584,15 +2561,27 @@ g_type_interface_get_plugin (GType instance_type,
} }
GType GType
g_type_fundamental_last (void) g_type_fundamental_next (void)
{ {
GType type; GType type;
G_READ_LOCK (&type_rw_lock); G_READ_LOCK (&type_rw_lock);
type = static_last_fundamental_id; type = static_fundamental_next;
G_READ_UNLOCK (&type_rw_lock); G_READ_UNLOCK (&type_rw_lock);
return type; return type <= G_TYPE_FUNDAMENTAL_MAX ? type : 0;
}
GType
g_type_fundamental (GType type_id)
{
TypeNode *node;
G_READ_LOCK (&type_rw_lock);
node = lookup_type_node_L (type_id);
G_READ_UNLOCK (&type_rw_lock);
return node ? NODE_FUNDAMENTAL_TYPE (node) : 0;
} }
gboolean gboolean
@ -2876,7 +2865,6 @@ void
g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
{ {
G_LOCK_DEFINE_STATIC (type_init_lock); G_LOCK_DEFINE_STATIC (type_init_lock);
static TypeNode *type0_node = NULL;
const gchar *env_string; const gchar *env_string;
GTypeInfo info; GTypeInfo info;
TypeNode *node; TypeNode *node;
@ -2886,7 +2874,7 @@ g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
G_WRITE_LOCK (&type_rw_lock); G_WRITE_LOCK (&type_rw_lock);
if (static_last_fundamental_id) if (static_quark_type_flags)
{ {
G_WRITE_UNLOCK (&type_rw_lock); G_WRITE_UNLOCK (&type_rw_lock);
G_UNLOCK (type_init_lock); G_UNLOCK (type_init_lock);
@ -2919,11 +2907,7 @@ g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
/* invalid type G_TYPE_INVALID (0) /* invalid type G_TYPE_INVALID (0)
*/ */
static_last_fundamental_id = 1; static_fundamental_type_nodes[0] = NULL;
static_type_nodes = g_renew (TypeNode**, static_type_nodes, static_last_fundamental_id);
static_type_nodes[0] = &type0_node;
static_branch_seqnos = g_renew (GType, static_branch_seqnos, static_last_fundamental_id);
static_branch_seqnos[0] = 1;
/* void type G_TYPE_NONE /* void type G_TYPE_NONE
*/ */

66
gobject/gtype.h
View File

@ -29,46 +29,48 @@ G_BEGIN_DECLS
/* Basic Type Macros /* Basic Type Macros
*/ */
#define G_TYPE_FUNDAMENTAL(type) ((type) & 0xff) #define G_TYPE_FUNDAMENTAL(type) (g_type_fundamental (type))
#define G_TYPE_FUNDAMENTAL_MAX (0xff) #define G_TYPE_FUNDAMENTAL_MAX (255 << G_TYPE_FUNDAMENTAL_SHIFT)
#define G_TYPE_FUNDAMENTAL_LAST ((GType) g_type_fundamental_last ()) #define G_TYPE_FUNDAMENTAL_SHIFT (2)
/* predefined fundamental and derived types /* Constant fundamental types
*/ */
typedef enum /*< skip >*/ typedef enum /*< skip >*/
{ {
/* standard types, introduced by g_type_init() */ /* standard types, introduced by g_type_init() */
G_TYPE_INVALID, G_TYPE_INVALID = 0 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_NONE, G_TYPE_NONE = 1 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_INTERFACE, G_TYPE_INTERFACE = 2 << G_TYPE_FUNDAMENTAL_SHIFT,
/* GLib type ids */ /* GLib type IDs */
G_TYPE_CHAR, G_TYPE_CHAR = 3 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_UCHAR, G_TYPE_UCHAR = 4 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_BOOLEAN, G_TYPE_BOOLEAN = 5 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_INT, G_TYPE_INT = 6 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_UINT, G_TYPE_UINT = 7 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_LONG, G_TYPE_LONG = 8 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_ULONG, G_TYPE_ULONG = 9 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_INT64, G_TYPE_INT64 = 10 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_UINT64, G_TYPE_UINT64 = 11 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_ENUM, G_TYPE_ENUM = 12 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_FLAGS, G_TYPE_FLAGS = 13 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_FLOAT, G_TYPE_FLOAT = 14 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_DOUBLE, G_TYPE_DOUBLE = 15 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_STRING, G_TYPE_STRING = 16 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_POINTER, G_TYPE_POINTER = 17 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_BOXED, G_TYPE_BOXED = 18 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_PARAM, G_TYPE_PARAM = 19 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_OBJECT, G_TYPE_OBJECT = 20 << G_TYPE_FUNDAMENTAL_SHIFT,
/* reserved fundamental type ids, /* reserved fundamental type ids,
* mail gtk-devel-list@redhat.com for reservations * mail gtk-devel-list@redhat.com for reservations
*/ */
G_TYPE_RESERVED_BSE_FIRST, G_TYPE_RESERVED_GLIB_FIRST = 21 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_RESERVED_BSE_LAST = G_TYPE_RESERVED_BSE_FIRST + 15, G_TYPE_RESERVED_GLIB_LAST = 31 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_RESERVED_LAST_FUNDAMENTAL, G_TYPE_RESERVED_BSE_FIRST = 32 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_RESERVED_BSE_LAST = 48 << G_TYPE_FUNDAMENTAL_SHIFT,
G_TYPE_RESERVED_USER_FIRST = 49 << G_TYPE_FUNDAMENTAL_SHIFT
} GTypeFundamentals; } GTypeFundamentals;
@ -83,7 +85,6 @@ typedef enum /*< skip >*/
#define G_TYPE_IS_DEEP_DERIVABLE(type) (g_type_test_flags ((type), G_TYPE_FLAG_DEEP_DERIVABLE)) #define G_TYPE_IS_DEEP_DERIVABLE(type) (g_type_test_flags ((type), G_TYPE_FLAG_DEEP_DERIVABLE))
#define G_TYPE_IS_ABSTRACT(type) (g_type_test_flags ((type), G_TYPE_FLAG_ABSTRACT)) #define G_TYPE_IS_ABSTRACT(type) (g_type_test_flags ((type), G_TYPE_FLAG_ABSTRACT))
#define G_TYPE_IS_VALUE_ABSTRACT(type) (g_type_test_flags ((type), G_TYPE_FLAG_VALUE_ABSTRACT)) #define G_TYPE_IS_VALUE_ABSTRACT(type) (g_type_test_flags ((type), G_TYPE_FLAG_VALUE_ABSTRACT))
#define G_TYPE_IS_PARAM(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM)
#define G_TYPE_IS_VALUE_TYPE(type) (g_type_check_is_value_type (type)) #define G_TYPE_IS_VALUE_TYPE(type) (g_type_check_is_value_type (type))
#define G_TYPE_HAS_VALUE_TABLE(type) (g_type_value_table_peek (type) != NULL) #define G_TYPE_HAS_VALUE_TABLE(type) (g_type_value_table_peek (type) != NULL)
@ -171,7 +172,6 @@ GType g_type_next_base (GType leaf_type
GType root_type); GType root_type);
gboolean g_type_is_a (GType type, gboolean g_type_is_a (GType type,
GType is_a_type); GType is_a_type);
//FIXME: guint g_type_fundamental_branch_last (GType type);
gpointer g_type_class_ref (GType type); gpointer g_type_class_ref (GType type);
gpointer g_type_class_peek (GType type); gpointer g_type_class_peek (GType type);
void g_type_class_unref (gpointer g_class); void g_type_class_unref (gpointer g_class);
@ -300,8 +300,8 @@ void g_type_interface_add_prerequisite (GType interface_type,
GTypePlugin* g_type_get_plugin (GType type); GTypePlugin* g_type_get_plugin (GType type);
GTypePlugin* g_type_interface_get_plugin (GType instance_type, GTypePlugin* g_type_interface_get_plugin (GType instance_type,
GType implementation_type); GType implementation_type);
GType g_type_fundamental_next (void);
GType g_type_fundamental_last (void); GType g_type_fundamental (GType type_id);
GTypeInstance* g_type_create_instance (GType type); GTypeInstance* g_type_create_instance (GType type);
void g_type_free_instance (GTypeInstance *instance); void g_type_free_instance (GTypeInstance *instance);
void g_type_add_class_cache_func (gpointer cache_data, void g_type_add_class_cache_func (gpointer cache_data,