*
* FIXME:
* - force interface initialization for already existing classes
- * - make things threadsafe
+ *
+ * LOCKING:
+ * lock handling issues when calling static functions are indicated by
+ * uppercase letter postfixes, all static functions have to have
+ * one of the below postfixes:
+ * - _I: [Indifferent about locking]
+ * function doesn't care about locks at all
+ * - _U: [Unlocked invocation]
+ * no read or write lock has to be held across function invocation
+ * (locks may be acquired and released during invocation though)
+ * - _L: [Locked invocation]
+ * a write lock or more than 0 read locks have to be held across
+ * function invocation
+ * - _W: [Write-locked invocation]
+ * a write lock has to be held across function invokation
+ * - _Wm: [Write-locked invocation, mutatable]
+ * like _W, but the write lock might be released and reacquired
+ * during invocation, watch your pointers
*/
+static GStaticRWLock type_rw_lock = G_STATIC_RW_LOCK_INIT;
+#define G_READ_LOCK(rw_lock) g_static_rw_lock_reader_lock (rw_lock)
+#define G_READ_UNLOCK(rw_lock) g_static_rw_lock_reader_unlock (rw_lock)
+#define G_WRITE_LOCK(rw_lock) g_static_rw_lock_writer_lock (rw_lock)
+#define G_WRITE_UNLOCK(rw_lock) g_static_rw_lock_writer_unlock (rw_lock)
+#define INVALID_RECURSION(func, arg, type_name) G_STMT_START{ \
+ static const gchar *_action = " invalidly modified type "; \
+ gpointer _arg = (gpointer) (arg); gchar *_tname = (type_name), *_fname = (func); \
+ if (_arg) \
+ g_error ("%s(%p)%s`%s'", _fname, _arg, _action, _tname); \
+ else \
+ g_error ("%s()%s`%s'", _fname, _action, _tname); \
+}G_STMT_END
+
#define TYPE_FUNDAMENTAL_FLAG_MASK (G_TYPE_FLAG_CLASSED | \
G_TYPE_FLAG_INSTANTIATABLE | \
G_TYPE_FLAG_DERIVABLE | \
#define TYPE_FLAG_MASK (G_TYPE_FLAG_ABSTRACT)
-
/* --- typedefs --- */
typedef struct _TypeNode TypeNode;
typedef struct _CommonData CommonData;
/* --- prototypes --- */
-static inline GTypeFundamentalInfo* type_node_fundamental_info (TypeNode *node);
-static void type_add_flags (TypeNode *node,
+static inline GTypeFundamentalInfo* type_node_fundamental_info_L (TypeNode *node);
+static void type_add_flags_W (TypeNode *node,
GTypeFlags flags);
-static void type_data_make (TypeNode *node,
+static void type_data_make_W (TypeNode *node,
const GTypeInfo *info,
const GTypeValueTable *value_table);
-static inline void type_data_ref (TypeNode *node);
-static inline void type_data_unref (TypeNode *node,
- gboolean uncached);
-static void type_data_last_unref (GType type,
- gboolean uncached);
+static inline void type_data_ref_Wm (TypeNode *node);
+static inline void type_data_unref_Wm (TypeNode *node,
+ gboolean uncached);
+static void type_data_last_unref_Wm (GType type,
+ gboolean uncached);
/* --- structures --- */
GType *children;
TypeData *data;
GQuark qname;
- GData *static_gdata;
+ GData *global_gdata;
union {
IFaceEntry *iface_entries;
IFaceHolder *iface_conformants;
GType supers[1]; /* flexible array */
};
#define SIZEOF_BASE_TYPE_NODE() (G_STRUCT_OFFSET (TypeNode, supers))
-#define MAX_N_SUPERS (255)
-#define MAX_N_CHILDREN (4095)
-#define MAX_N_IFACES (511)
+#define MAX_N_SUPERS (255)
+#define MAX_N_CHILDREN (4095)
+#define MAX_N_IFACES (511)
+#define NODE_TYPE(node) (node->supers[0])
+#define NODE_PARENT_TYPE(node) (node->supers[1])
+#define NODE_NAME(node) (g_quark_to_string (node->qname))
struct _IFaceHolder
{
/* --- variables --- */
-static guint n_class_cache_funcs = 0;
-static ClassCacheFunc *class_cache_funcs = NULL;
-static GType last_fundamental_id = 0;
-static GQuark quark_type_flags = 0;
+static guint static_n_class_cache_funcs = 0;
+static ClassCacheFunc *static_class_cache_funcs = NULL;
+static GType static_last_fundamental_id = 0;
+static GQuark static_quark_type_flags = 0;
/* --- externs --- */
/* --- type nodes --- */
-static GHashTable *g_type_nodes_ht = NULL;
-static GType *g_branch_seqnos = NULL;
-static TypeNode ***g_type_nodes = NULL;
+static GHashTable *static_type_nodes_ht = NULL;
+static GType *static_branch_seqnos = NULL;
+static TypeNode ***static_type_nodes = NULL;
static inline TypeNode*
-LOOKUP_TYPE_NODE (register GType utype)
+lookup_type_node_L (register GType utype)
{
register GType ftype = G_TYPE_FUNDAMENTAL (utype);
register GType b_seqno = G_TYPE_BRANCH_SEQNO (utype);
-
- if (ftype < last_fundamental_id && b_seqno < g_branch_seqnos[ftype])
- return g_type_nodes[ftype][b_seqno];
+
+ if (ftype < static_last_fundamental_id && b_seqno < static_branch_seqnos[ftype])
+ return static_type_nodes[ftype][b_seqno];
else
return NULL;
}
-#define NODE_TYPE(node) (node->supers[0])
-#define NODE_PARENT_TYPE(node) (node->supers[1])
-#define NODE_NAME(node) (g_quark_to_string (node->qname))
static TypeNode*
-type_node_any_new (TypeNode *pnode,
- GType ftype,
- const gchar *name,
- GTypePlugin *plugin,
- GTypeFundamentalFlags type_flags)
+type_node_any_new_W (TypeNode *pnode,
+ GType ftype,
+ const gchar *name,
+ GTypePlugin *plugin,
+ GTypeFundamentalFlags type_flags)
{
- guint branch_last, n_supers = pnode ? pnode->n_supers + 1 : 0;
+ guint branch_last, n_supers;
GType type;
TypeNode *node;
guint i, node_size = 0;
-
- branch_last = g_branch_seqnos[ftype]++;
+
+ n_supers = pnode ? pnode->n_supers + 1 : 0;
+ branch_last = static_branch_seqnos[ftype]++;
type = G_TYPE_DERIVE_ID (ftype, branch_last);
- if (!branch_last || g_bit_storage (branch_last - 1) < g_bit_storage (g_branch_seqnos[ftype] - 1))
- g_type_nodes[ftype] = g_renew (TypeNode*, g_type_nodes[ftype], 1 << g_bit_storage (g_branch_seqnos[ftype] - 1));
-
+ 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)
node_size += sizeof (GTypeFundamentalInfo); /* fundamental type info */
node_size += SIZEOF_BASE_TYPE_NODE (); /* TypeNode structure */
node = g_malloc0 (node_size);
if (!pnode) /* offset fundamental types */
node = G_STRUCT_MEMBER_P (node, sizeof (GTypeFundamentalInfo));
- g_type_nodes[ftype][branch_last] = node;
-
+ static_type_nodes[ftype][branch_last] = node;
+
node->n_supers = n_supers;
if (!pnode)
{
node->supers[0] = type;
node->supers[1] = 0;
-
+
node->is_classed = (type_flags & G_TYPE_FLAG_CLASSED) != 0;
node->is_instantiatable = (type_flags & G_TYPE_FLAG_INSTANTIATABLE) != 0;
node->is_iface = G_TYPE_IS_INTERFACE (type);
-
+
node->n_ifaces = 0;
if (node->is_iface)
node->private.iface_conformants = NULL;
{
node->supers[0] = type;
memcpy (node->supers + 1, pnode->supers, sizeof (GType) * (1 + pnode->n_supers + 1));
-
+
node->is_classed = pnode->is_classed;
node->is_instantiatable = pnode->is_instantiatable;
node->is_iface = pnode->is_iface;
-
+
if (node->is_iface)
{
node->n_ifaces = 0;
pnode->children = g_renew (GType, pnode->children, pnode->n_children);
pnode->children[i] = type;
}
-
+
node->plugin = plugin;
node->n_children = 0;
node->children = NULL;
node->data = NULL;
node->qname = g_quark_from_string (name);
- node->static_gdata = NULL;
-
- g_hash_table_insert (g_type_nodes_ht,
+ node->global_gdata = NULL;
+
+ g_hash_table_insert (static_type_nodes_ht,
GUINT_TO_POINTER (node->qname),
GUINT_TO_POINTER (type));
-
return node;
}
static inline GTypeFundamentalInfo*
-type_node_fundamental_info (TypeNode *node)
+type_node_fundamental_info_L (TypeNode *node)
{
GType ftype = G_TYPE_FUNDAMENTAL (NODE_TYPE (node));
if (ftype != NODE_TYPE (node))
- node = LOOKUP_TYPE_NODE (ftype);
+ node = lookup_type_node_L (ftype);
return node ? G_STRUCT_MEMBER_P (node, - (gssize) sizeof (GTypeFundamentalInfo)) : NULL;
}
static TypeNode*
-type_node_fundamental_new (GType ftype,
- const gchar *name,
- GTypeFundamentalFlags type_flags)
+type_node_fundamental_new_W (GType ftype,
+ const gchar *name,
+ GTypeFundamentalFlags type_flags)
{
GTypeFundamentalInfo *finfo;
TypeNode *node;
- guint i, flast = last_fundamental_id;
+ guint i, flast;
+
+ flast = static_last_fundamental_id;
g_assert (ftype == G_TYPE_FUNDAMENTAL (ftype));
type_flags &= TYPE_FUNDAMENTAL_FLAG_MASK;
-
- last_fundamental_id = MAX (last_fundamental_id, ftype + 1);
- if (last_fundamental_id > flast)
+
+ static_last_fundamental_id = MAX (static_last_fundamental_id, ftype + 1);
+ if (static_last_fundamental_id > flast)
{
- g_type_nodes = g_renew (TypeNode**, g_type_nodes, last_fundamental_id);
- g_branch_seqnos = g_renew (GType, g_branch_seqnos, last_fundamental_id);
- for (i = flast; i < last_fundamental_id; i++)
+ 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++)
{
- g_type_nodes[i] = NULL;
- g_branch_seqnos[i] = 0;
+ static_type_nodes[i] = NULL;
+ static_branch_seqnos[i] = 0;
}
}
- g_assert (g_branch_seqnos[ftype] == 0);
-
- node = type_node_any_new (NULL, ftype, name, NULL, type_flags);
- finfo = type_node_fundamental_info (node);
+ g_assert (static_branch_seqnos[ftype] == 0);
+
+ node = type_node_any_new_W (NULL, ftype, name, NULL, type_flags);
+
+ finfo = type_node_fundamental_info_L (node);
finfo->type_flags = type_flags;
-
+
return node;
}
static TypeNode*
-type_node_new (TypeNode *pnode,
- const gchar *name,
- GTypePlugin *plugin)
-
+type_node_new_W (TypeNode *pnode,
+ const gchar *name,
+ GTypePlugin *plugin)
+
{
g_assert (pnode);
g_assert (pnode->n_supers < MAX_N_SUPERS);
g_assert (pnode->n_children < MAX_N_CHILDREN);
-
- return type_node_any_new (pnode, G_TYPE_FUNDAMENTAL (NODE_TYPE (pnode)), name, plugin, 0);
+
+ return type_node_any_new_W (pnode, G_TYPE_FUNDAMENTAL (NODE_TYPE (pnode)), name, plugin, 0);
}
static inline IFaceEntry*
-type_lookup_iface_entry (TypeNode *node,
- TypeNode *iface)
+type_lookup_iface_entry_L (TypeNode *node,
+ TypeNode *iface)
{
if (iface->is_iface && node->n_ifaces)
{
IFaceEntry *ifaces = node->private.iface_entries - 1;
guint n_ifaces = node->n_ifaces;
GType iface_type = NODE_TYPE (iface);
-
+
do
{
guint i;
IFaceEntry *check;
-
+
i = (n_ifaces + 1) / 2;
check = ifaces + i;
if (iface_type == check->iface_type)
}
while (n_ifaces);
}
-
+
return NULL;
}
static inline gchar*
-type_descriptive_name (GType type)
+type_descriptive_name_L (GType type)
{
if (type)
{
- gchar *name = g_type_name (type);
-
- return name ? name : "<unknown>";
+ TypeNode *node = lookup_type_node_L (type);
+
+ return node ? NODE_NAME (node) : "<unknown>";
}
else
return "<invalid>";
}
+static inline gchar*
+type_descriptive_name_U (GType type)
+{
+ gchar *name;
+
+ G_READ_LOCK (&type_rw_lock);
+ name = type_descriptive_name_L (type);
+ G_READ_UNLOCK (&type_rw_lock);
+
+ return name;
+}
+
/* --- type consistency checks --- */
static gboolean
-check_plugin (GTypePlugin *plugin,
- gboolean need_complete_type_info,
- gboolean need_complete_interface_info,
- const gchar *type_name)
+check_plugin_U (GTypePlugin *plugin,
+ gboolean need_complete_type_info,
+ gboolean need_complete_interface_info,
+ const gchar *type_name)
{
+ /* G_IS_TYPE_PLUGIN() and G_TYPE_PLUGIN_GET_CLASS() are external calls: _U
+ */
if (!plugin)
{
g_warning ("plugin handle for type `%s' is NULL",
}
static gboolean
-check_type_name (const gchar *type_name)
+check_type_name_U (const gchar *type_name)
{
static const gchar *extra_chars = "-_+";
const gchar *p = type_name;
gboolean name_valid;
-
+
if (!type_name[0] || !type_name[1] || !type_name[2])
{
g_warning ("type name `%s' is too short", type_name);
g_warning ("cannot register existing type `%s'", type_name);
return FALSE;
}
-
+
return TRUE;
}
static gboolean
-check_derivation (GType parent_type,
- const gchar *type_name)
+check_derivation_U (GType parent_type,
+ const gchar *type_name)
{
- TypeNode *pnode = LOOKUP_TYPE_NODE (parent_type);
- GTypeFundamentalInfo* finfo = type_node_fundamental_info (pnode);
+ TypeNode *pnode;
+ GTypeFundamentalInfo* finfo;
+ G_READ_LOCK (&type_rw_lock);
+ pnode = lookup_type_node_L (parent_type);
if (!pnode)
{
+ G_READ_UNLOCK (&type_rw_lock);
g_warning ("cannot derive type `%s' from invalid parent type `%s'",
type_name,
- type_descriptive_name (parent_type));
+ type_descriptive_name_U (parent_type));
return FALSE;
}
+ finfo = type_node_fundamental_info_L (pnode);
/* ensure flat derivability */
if (!(finfo->type_flags & G_TYPE_FLAG_DERIVABLE))
{
+ G_READ_UNLOCK (&type_rw_lock);
g_warning ("cannot derive `%s' from non-derivable parent type `%s'",
type_name,
NODE_NAME (pnode));
if (parent_type != G_TYPE_FUNDAMENTAL (parent_type) &&
!(finfo->type_flags & G_TYPE_FLAG_DEEP_DERIVABLE))
{
+ G_READ_UNLOCK (&type_rw_lock);
g_warning ("cannot derive `%s' from non-fundamental parent type `%s'",
type_name,
NODE_NAME (pnode));
return FALSE;
}
+ G_READ_UNLOCK (&type_rw_lock);
return TRUE;
}
static gboolean
-check_value_table (const gchar *type_name,
- const GTypeValueTable *value_table)
+check_value_table_I (const gchar *type_name,
+ const GTypeValueTable *value_table)
{
if (!value_table)
return FALSE;
value_table->lcopy_type || value_table->lcopy_value)
g_warning ("cannot handle uninitializable values of type `%s'",
type_name);
-
return FALSE;
}
else /* value_table->value_init != NULL */
return FALSE;
}
}
-
return TRUE;
}
static gboolean
-check_type_info (TypeNode *pnode,
- GType ftype,
- const gchar *type_name,
- const GTypeInfo *info)
+check_type_info_L (TypeNode *pnode,
+ GType ftype,
+ const gchar *type_name,
+ const GTypeInfo *info)
{
- GTypeFundamentalInfo *finfo = type_node_fundamental_info (LOOKUP_TYPE_NODE (ftype));
+ GTypeFundamentalInfo *finfo = type_node_fundamental_info_L (lookup_type_node_L (ftype));
gboolean is_interface = G_TYPE_IS_INTERFACE (ftype);
-
+
/* check instance members */
if (!(finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) &&
(info->instance_size || info->n_preallocs || info->instance_init))
return FALSE;
}
}
-
+
return TRUE;
}
static TypeNode*
-find_conforming_type (TypeNode *pnode,
- TypeNode *iface)
+find_conforming_type_L (TypeNode *pnode,
+ TypeNode *iface)
{
TypeNode *node = NULL;
guint i;
-
- if (type_lookup_iface_entry (pnode, iface))
+
+ if (type_lookup_iface_entry_L (pnode, iface))
return pnode;
-
+
for (i = 0; i < pnode->n_children && !node; i++)
- node = find_conforming_type (LOOKUP_TYPE_NODE (pnode->children[i]), iface);
-
+ node = find_conforming_type_L (lookup_type_node_L (pnode->children[i]), iface);
+
return node;
}
static gboolean
-check_add_interface (GType instance_type,
- GType iface_type)
+check_add_interface_L (GType instance_type,
+ GType iface_type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (instance_type);
- TypeNode *iface = LOOKUP_TYPE_NODE (iface_type);
+ TypeNode *node = lookup_type_node_L (instance_type);
+ TypeNode *iface = lookup_type_node_L (iface_type);
TypeNode *tnode;
-
+
if (!node || !node->is_instantiatable)
{
g_warning ("cannot add interfaces to invalid (non-instantiatable) type `%s'",
- type_descriptive_name (instance_type));
+ type_descriptive_name_L (instance_type));
return FALSE;
}
if (!iface || !iface->is_iface)
{
g_warning ("cannot add invalid (non-interface) type `%s' to type `%s'",
- type_descriptive_name (iface_type),
+ type_descriptive_name_L (iface_type),
NODE_NAME (node));
return FALSE;
}
- tnode = LOOKUP_TYPE_NODE (NODE_PARENT_TYPE (iface));
- if (NODE_PARENT_TYPE (tnode) && !type_lookup_iface_entry (node, tnode))
+ tnode = lookup_type_node_L (NODE_PARENT_TYPE (iface));
+ if (NODE_PARENT_TYPE (tnode) && !type_lookup_iface_entry_L (node, tnode))
{
g_warning ("cannot add sub-interface `%s' to type `%s' which does not conform to super-interface `%s'",
NODE_NAME (iface),
NODE_NAME (tnode));
return FALSE;
}
- tnode = find_conforming_type (node, iface);
+ tnode = find_conforming_type_L (node, iface);
if (tnode)
{
g_warning ("cannot add interface type `%s' to type `%s', since type `%s' already conforms to interface",
NODE_NAME (tnode));
return FALSE;
}
-
return TRUE;
}
static gboolean
-check_interface_info (TypeNode *iface,
- GType instance_type,
- const GInterfaceInfo *info)
+check_interface_info_L (TypeNode *iface,
+ GType instance_type,
+ const GInterfaceInfo *info)
{
if ((info->interface_finalize || info->interface_data) && !info->interface_init)
{
g_warning ("interface type `%s' for type `%s' comes without initializer",
NODE_NAME (iface),
- type_descriptive_name (instance_type));
+ type_descriptive_name_L (instance_type));
return FALSE;
}
-
+
return TRUE;
}
-
/* --- type info (type node data) --- */
static void
-type_add_flags (TypeNode *node,
- GTypeFlags flags)
-{
- guint dflags;
-
- g_return_if_fail ((flags & ~TYPE_FLAG_MASK) == 0);
- g_return_if_fail (node != NULL);
-
- if (!quark_type_flags)
- quark_type_flags = g_quark_from_static_string ("GTypeFlags");
- if ((flags & G_TYPE_FLAG_ABSTRACT) && node->is_classed &&
- node->data && node->data->class.class)
- g_warning ("tagging type `%s' as abstract after class initialization", NODE_NAME (node));
- dflags = GPOINTER_TO_UINT (g_type_get_qdata (NODE_TYPE (node), quark_type_flags));
- dflags |= flags;
- g_type_set_qdata (NODE_TYPE (node), quark_type_flags, GUINT_TO_POINTER (dflags));
-}
-
-static void
-type_data_make (TypeNode *node,
- const GTypeInfo *info,
- const GTypeValueTable *value_table)
+type_data_make_W (TypeNode *node,
+ const GTypeInfo *info,
+ const GTypeValueTable *value_table)
{
TypeData *data;
GTypeValueTable *vtable = NULL;
if (!value_table)
{
- TypeNode *pnode = LOOKUP_TYPE_NODE (NODE_PARENT_TYPE (node));
+ TypeNode *pnode = lookup_type_node_L (NODE_PARENT_TYPE (node));
if (pnode)
vtable = pnode->data->common.value_table;
if (vtable_size)
*vtable = *value_table;
node->data->common.value_table = vtable;
-
+
g_assert (node->data->common.value_table != NULL); /* paranoid */
}
static inline void
-type_data_ref (TypeNode *node)
+type_data_ref_Wm (TypeNode *node)
{
if (!node->data)
{
- TypeNode *pnode = LOOKUP_TYPE_NODE (NODE_PARENT_TYPE (node));
+ TypeNode *pnode = lookup_type_node_L (NODE_PARENT_TYPE (node));
GTypeInfo tmp_info;
GTypeValueTable tmp_value_table;
g_assert (node->plugin != NULL);
if (pnode)
- type_data_ref (pnode);
+ {
+ type_data_ref_Wm (pnode);
+ if (node->data)
+ INVALID_RECURSION ("g_type_plugin_*", node->plugin, NODE_NAME (node));
+ }
memset (&tmp_info, 0, sizeof (tmp_info));
memset (&tmp_value_table, 0, sizeof (tmp_value_table));
+
+ G_WRITE_UNLOCK (&type_rw_lock);
g_type_plugin_use (node->plugin);
g_type_plugin_complete_type_info (node->plugin, NODE_TYPE (node), &tmp_info, &tmp_value_table);
- check_type_info (pnode, G_TYPE_FUNDAMENTAL (NODE_TYPE (node)), NODE_NAME (node), &tmp_info);
- type_data_make (node, &tmp_info,
- check_value_table (NODE_NAME (node), &tmp_value_table) ? &tmp_value_table : NULL);
+ G_WRITE_LOCK (&type_rw_lock);
+ if (node->data)
+ 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);
+ type_data_make_W (node, &tmp_info,
+ check_value_table_I (NODE_NAME (node),
+ &tmp_value_table) ? &tmp_value_table : NULL);
}
else
{
g_assert (node->data->common.ref_count > 0);
-
+
node->data->common.ref_count += 1;
}
}
static inline void
-type_data_unref (TypeNode *node,
- gboolean uncached)
+type_data_unref_Wm (TypeNode *node,
+ gboolean uncached)
{
g_assert (node->data && node->data->common.ref_count);
-
+
if (node->data->common.ref_count > 1)
node->data->common.ref_count -= 1;
else
NODE_NAME (node));
return;
}
-
- type_data_last_unref (NODE_TYPE (node), uncached);
+
+ type_data_last_unref_Wm (NODE_TYPE (node), uncached);
}
}
static void
-type_node_add_iface_entry (TypeNode *node,
- GType iface_type)
+type_node_add_iface_entry_W (TypeNode *node,
+ GType iface_type)
{
IFaceEntry *entries;
guint i;
-
+
g_assert (node->is_instantiatable && node->n_ifaces < MAX_N_IFACES);
-
+
node->n_ifaces++;
node->private.iface_entries = g_renew (IFaceEntry, node->private.iface_entries, node->n_ifaces);
entries = node->private.iface_entries;
g_memmove (entries + i + 1, entries + i, sizeof (entries[0]) * (node->n_ifaces - i - 1));
entries[i].iface_type = iface_type;
entries[i].vtable = NULL;
-
+
for (i = 0; i < node->n_children; i++)
- type_node_add_iface_entry (LOOKUP_TYPE_NODE (node->children[i]), iface_type);
+ type_node_add_iface_entry_W (lookup_type_node_L (node->children[i]), iface_type);
}
static void
-type_add_interface (TypeNode *node,
- TypeNode *iface,
- const GInterfaceInfo *info,
- GTypePlugin *plugin)
+type_add_interface_W (TypeNode *node,
+ TypeNode *iface,
+ const GInterfaceInfo *info,
+ GTypePlugin *plugin)
{
IFaceHolder *iholder = g_new0 (IFaceHolder, 1);
iholder->instance_type = NODE_TYPE (node);
iholder->info = info ? g_memdup (info, sizeof (*info)) : NULL;
iholder->plugin = plugin;
-
- type_node_add_iface_entry (node, NODE_TYPE (iface));
+
+ type_node_add_iface_entry_W (node, NODE_TYPE (iface));
}
static IFaceHolder*
-type_iface_retrive_holder_info (TypeNode *iface,
- GType instance_type)
+type_iface_retrive_holder_info_Wm (TypeNode *iface,
+ GType instance_type)
{
IFaceHolder *iholder = iface->private.iface_conformants;
-
+
g_assert (iface->is_iface);
-
+
while (iholder->instance_type != instance_type)
iholder = iholder->next;
-
+
if (!iholder->info)
{
GInterfaceInfo tmp_info;
g_assert (iholder->plugin != NULL);
- type_data_ref (iface);
-
+ type_data_ref_Wm (iface);
+ if (iholder->info)
+ INVALID_RECURSION ("g_type_plugin_*", iface->plugin, NODE_NAME (iface));
+
memset (&tmp_info, 0, sizeof (tmp_info));
+
+ G_WRITE_UNLOCK (&type_rw_lock);
g_type_plugin_use (iholder->plugin);
g_type_plugin_complete_interface_info (iholder->plugin, NODE_TYPE (iface), instance_type, &tmp_info);
- check_interface_info (iface, instance_type, &tmp_info);
+ G_WRITE_LOCK (&type_rw_lock);
+ if (iholder->info)
+ INVALID_RECURSION ("g_type_plugin_*", iholder->plugin, NODE_NAME (iface));
+
+ check_interface_info_L (iface, instance_type, &tmp_info);
iholder->info = g_memdup (&tmp_info, sizeof (tmp_info));
}
}
static void
-type_iface_blow_holder_info (TypeNode *iface,
- GType instance_type)
+type_iface_blow_holder_info_Wm (TypeNode *iface,
+ GType instance_type)
{
IFaceHolder *iholder = iface->private.iface_conformants;
-
+
g_assert (iface->is_iface);
-
+
while (iholder->instance_type != instance_type)
iholder = iholder->next;
-
+
if (iholder->info && iholder->plugin)
{
g_free (iholder->info);
iholder->info = NULL;
+
+ G_WRITE_UNLOCK (&type_rw_lock);
g_type_plugin_unuse (iholder->plugin);
-
- type_data_unref (iface, FALSE);
+ G_WRITE_LOCK (&type_rw_lock);
+
+ type_data_unref_Wm (iface, FALSE);
}
}
GTypeInstance*
g_type_create_instance (GType type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
+ TypeNode *node;
GTypeInstance *instance;
GTypeClass *class;
guint i;
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
+ G_READ_UNLOCK (&type_rw_lock);
if (!node || !node->is_instantiatable)
{
g_warning ("cannot create new instance of invalid (non-instantiatable) type `%s'",
- type_descriptive_name (type));
+ type_descriptive_name_U (type));
return NULL;
}
+ /* G_TYPE_IS_ABSTRACT() is an external call: _U */
if (G_TYPE_IS_ABSTRACT (type))
{
g_warning ("cannot create instance of abstract (non-instantiatable) type `%s'",
- type_descriptive_name (type));
+ type_descriptive_name_U (type));
return NULL;
}
if (node->data->instance.n_preallocs)
{
+ G_WRITE_LOCK (&type_rw_lock);
if (!node->data->instance.mem_chunk)
node->data->instance.mem_chunk = g_mem_chunk_new (NODE_NAME (node),
node->data->instance.instance_size,
node->data->instance.n_preallocs),
G_ALLOC_AND_FREE);
instance = g_chunk_new0 (GTypeInstance, node->data->instance.mem_chunk);
+ G_WRITE_UNLOCK (&type_rw_lock);
}
else
- instance = g_malloc0 (node->data->instance.instance_size);
-
+ instance = g_malloc0 (node->data->instance.instance_size); /* fine without read lock */
for (i = node->n_supers; i > 0; i--)
{
- TypeNode *pnode = LOOKUP_TYPE_NODE (node->supers[i]);
+ TypeNode *pnode;
+
+ G_READ_LOCK (&type_rw_lock);
+ pnode = lookup_type_node_L (node->supers[i]);
+ G_READ_UNLOCK (&type_rw_lock);
if (pnode->data->instance.instance_init)
{
}
}
instance->g_class = class;
+
if (node->data->instance.instance_init)
node->data->instance.instance_init (instance, class);
-
+
return instance;
}
{
TypeNode *node;
GTypeClass *class;
-
+
g_return_if_fail (instance != NULL && instance->g_class != NULL);
-
+
+ G_READ_LOCK (&type_rw_lock);
class = instance->g_class;
- node = LOOKUP_TYPE_NODE (class->g_type);
+ node = lookup_type_node_L (class->g_type);
if (!node || !node->is_instantiatable || !node->data || node->data->class.class != (gpointer) class)
{
g_warning ("cannot free instance of invalid (non-instantiatable) type `%s'",
- type_descriptive_name (class->g_type));
+ type_descriptive_name_L (class->g_type));
+ G_READ_UNLOCK (&type_rw_lock);
return;
}
+ G_READ_UNLOCK (&type_rw_lock);
+ /* G_TYPE_IS_ABSTRACT() is an external call: _U */
if (G_TYPE_IS_ABSTRACT (NODE_TYPE (node)))
{
g_warning ("cannot free instance of abstract (non-instantiatable) type `%s'",
NODE_NAME (node));
return;
}
-
+
instance->g_class = NULL;
memset (instance, 0xaa, node->data->instance.instance_size); // FIXME: debugging hack
if (node->data->instance.n_preallocs)
- g_chunk_free (instance, node->data->instance.mem_chunk);
+ {
+ G_WRITE_LOCK (&type_rw_lock);
+ g_chunk_free (instance, node->data->instance.mem_chunk);
+ G_WRITE_UNLOCK (&type_rw_lock);
+ }
else
g_free (instance);
-
+
g_type_class_unref (class);
}
static void
-type_propagate_iface_vtable (TypeNode *pnode,
- TypeNode *iface,
- GTypeInterface *vtable)
+type_propagate_iface_vtable_W (TypeNode *pnode,
+ TypeNode *iface,
+ GTypeInterface *vtable)
{
- IFaceEntry *entry = type_lookup_iface_entry (pnode, iface);
+ IFaceEntry *entry = type_lookup_iface_entry_L (pnode, iface);
guint i;
-
+
entry->vtable = vtable;
for (i = 0; i < pnode->n_children; i++)
{
- TypeNode *node = LOOKUP_TYPE_NODE (pnode->children[i]);
-
- type_propagate_iface_vtable (node, iface, vtable);
+ TypeNode *node = lookup_type_node_L (pnode->children[i]);
+
+ type_propagate_iface_vtable_W (node, iface, vtable);
}
}
static void
-type_iface_vtable_init (TypeNode *iface,
- TypeNode *node)
+type_iface_vtable_init_Wm (TypeNode *iface,
+ TypeNode *node)
{
- IFaceEntry *entry = type_lookup_iface_entry (node, iface);
- IFaceHolder *iholder = type_iface_retrive_holder_info (iface, NODE_TYPE (node));
+ IFaceEntry *entry = type_lookup_iface_entry_L (node, iface);
+ IFaceHolder *iholder = type_iface_retrive_holder_info_Wm (iface, NODE_TYPE (node));
GTypeInterface *vtable;
g_assert (iface->data && entry && entry->vtable == NULL && iholder && iholder->info);
-
+
vtable = g_malloc0 (iface->data->iface.vtable_size);
- type_propagate_iface_vtable (node, iface, vtable);
+ type_propagate_iface_vtable_W (node, iface, vtable);
vtable->g_type = NODE_TYPE (iface);
vtable->g_instance_type = NODE_TYPE (node);
-
- if (iface->data->iface.vtable_init_base)
- iface->data->iface.vtable_init_base (vtable);
- if (iholder->info->interface_init)
- iholder->info->interface_init (vtable, iholder->info->interface_data);
+
+ if (iface->data->iface.vtable_init_base || iholder->info->interface_init)
+ {
+ G_WRITE_UNLOCK (&type_rw_lock);
+ if (iface->data->iface.vtable_init_base)
+ iface->data->iface.vtable_init_base (vtable);
+ if (iholder->info->interface_init)
+ iholder->info->interface_init (vtable, iholder->info->interface_data);
+ G_WRITE_LOCK (&type_rw_lock);
+ }
}
static void
-type_iface_vtable_finalize (TypeNode *iface,
- TypeNode *node,
- GTypeInterface *vtable)
+type_iface_vtable_finalize_Wm (TypeNode *iface,
+ TypeNode *node,
+ GTypeInterface *vtable)
{
- IFaceEntry *entry = type_lookup_iface_entry (node, iface);
+ IFaceEntry *entry = type_lookup_iface_entry_L (node, iface);
IFaceHolder *iholder = iface->private.iface_conformants;
-
+
g_assert (entry && entry->vtable == vtable);
-
+
while (iholder->instance_type != NODE_TYPE (node))
iholder = iholder->next;
g_assert (iholder && iholder->info);
-
- type_propagate_iface_vtable (node, iface, NULL);
- if (iholder->info->interface_finalize)
- iholder->info->interface_finalize (vtable, iholder->info->interface_data);
- if (iface->data->iface.vtable_finalize_base)
- iface->data->iface.vtable_finalize_base (vtable);
+ type_propagate_iface_vtable_W (node, iface, NULL);
+ if (iholder->info->interface_finalize || iface->data->iface.vtable_finalize_base)
+ {
+ G_WRITE_UNLOCK (&type_rw_lock);
+ if (iholder->info->interface_finalize)
+ iholder->info->interface_finalize (vtable, iholder->info->interface_data);
+ if (iface->data->iface.vtable_finalize_base)
+ iface->data->iface.vtable_finalize_base (vtable);
+ G_WRITE_LOCK (&type_rw_lock);
+ }
vtable->g_type = 0;
vtable->g_instance_type = 0;
g_free (vtable);
-
- type_iface_blow_holder_info (iface, NODE_TYPE (node));
+
+ type_iface_blow_holder_info_Wm (iface, NODE_TYPE (node));
}
static void
-type_class_init (TypeNode *node,
- GTypeClass *pclass)
+type_class_init_Wm (TypeNode *node,
+ GTypeClass *pclass)
{
GSList *slist, *init_slist = NULL;
GTypeClass *class;
if (pclass)
{
- TypeNode *pnode = LOOKUP_TYPE_NODE (pclass->g_type);
+ TypeNode *pnode = lookup_type_node_L (pclass->g_type);
memcpy (class, pclass, pnode->data->class.class_size);
}
-
class->g_type = NODE_TYPE (node);
+ G_WRITE_UNLOCK (&type_rw_lock);
+
/* stack all base class initialization functions, so we
* call them in ascending order.
*/
- for (bnode = node; bnode; bnode = LOOKUP_TYPE_NODE (NODE_PARENT_TYPE (bnode)))
+ G_READ_LOCK (&type_rw_lock);
+ for (bnode = node; bnode; bnode = lookup_type_node_L (NODE_PARENT_TYPE (bnode)))
if (bnode->data->class.class_init_base)
init_slist = g_slist_prepend (init_slist, (gpointer) bnode->data->class.class_init_base);
+ G_READ_UNLOCK (&type_rw_lock);
for (slist = init_slist; slist; slist = slist->next)
{
GBaseInitFunc class_init_base = (GBaseInitFunc) slist->data;
if (node->data->class.class_init)
node->data->class.class_init (class, (gpointer) node->data->class.class_data);
-
+
+ G_WRITE_LOCK (&type_rw_lock);
+
/* ok, we got the class done, now initialize all interfaces */
for (entry = NULL, i = 0; i < node->n_ifaces; i++)
if (!node->private.iface_entries[i].vtable)
entry = node->private.iface_entries + i;
while (entry)
{
- type_iface_vtable_init (LOOKUP_TYPE_NODE (entry->iface_type), node);
+ type_iface_vtable_init_Wm (lookup_type_node_L (entry->iface_type), node);
for (entry = NULL, i = 0; i < node->n_ifaces; i++)
if (!node->private.iface_entries[i].vtable)
}
static void
-type_data_finalize_class_ifaces (TypeNode *node)
+type_data_finalize_class_ifaces_Wm (TypeNode *node)
{
IFaceEntry *entry;
guint i;
g_assert (node->is_instantiatable && node->data && node->data->class.class && node->data->common.ref_count == 0);
g_message ("finalizing interfaces for %sClass `%s'",
- type_descriptive_name (G_TYPE_FUNDAMENTAL (NODE_TYPE (node))),
- type_descriptive_name (NODE_TYPE (node)));
+ type_descriptive_name_L (G_TYPE_FUNDAMENTAL (NODE_TYPE (node))),
+ type_descriptive_name_L (NODE_TYPE (node)));
for (entry = NULL, i = 0; i < node->n_ifaces; i++)
if (node->private.iface_entries[i].vtable &&
entry = node->private.iface_entries + i;
while (entry)
{
- type_iface_vtable_finalize (LOOKUP_TYPE_NODE (entry->iface_type), node, entry->vtable);
+ type_iface_vtable_finalize_Wm (lookup_type_node_L (entry->iface_type), node, entry->vtable);
for (entry = NULL, i = 0; i < node->n_ifaces; i++)
if (node->private.iface_entries[i].vtable &&
}
static void
-type_data_finalize_class (TypeNode *node,
- ClassData *cdata)
+type_data_finalize_class_U (TypeNode *node,
+ ClassData *cdata)
{
GTypeClass *class = cdata->class;
TypeNode *bnode;
g_assert (cdata->class && cdata->common.ref_count == 0);
g_message ("finalizing %sClass `%s'",
- type_descriptive_name (G_TYPE_FUNDAMENTAL (NODE_TYPE (node))),
- type_descriptive_name (NODE_TYPE (node)));
-
+ type_descriptive_name_U (G_TYPE_FUNDAMENTAL (NODE_TYPE (node))),
+ type_descriptive_name_U (NODE_TYPE (node)));
+
if (cdata->class_finalize)
cdata->class_finalize (class, (gpointer) cdata->class_data);
*/
if (cdata->class_finalize_base)
cdata->class_finalize_base (class);
- for (bnode = LOOKUP_TYPE_NODE (NODE_PARENT_TYPE (node)); bnode; bnode = LOOKUP_TYPE_NODE (NODE_PARENT_TYPE (bnode)))
+ G_READ_LOCK (&type_rw_lock);
+ for (bnode = lookup_type_node_L (NODE_PARENT_TYPE (node)); bnode; bnode = lookup_type_node_L (NODE_PARENT_TYPE (bnode)))
if (bnode->data->class.class_finalize_base)
- bnode->data->class.class_finalize_base (class);
+ {
+ G_READ_UNLOCK (&type_rw_lock);
+ bnode->data->class.class_finalize_base (class);
+ G_READ_LOCK (&type_rw_lock);
+ }
+ G_READ_UNLOCK (&type_rw_lock);
class->g_type = 0;
g_free (cdata->class);
}
static void
-type_data_last_unref (GType type,
- gboolean uncached)
+type_data_last_unref_Wm (GType type,
+ gboolean uncached)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
+ TypeNode *node = lookup_type_node_L (type);
+
g_return_if_fail (node != NULL && node->plugin != NULL);
if (!node->data || node->data->common.ref_count == 0)
{
g_warning ("cannot drop last reference to unreferenced type `%s'",
- type_descriptive_name (type));
+ type_descriptive_name_U (type));
return;
}
-
- if (node->is_classed && node->data && node->data->class.class)
+
+ if (node->is_classed && node->data && node->data->class.class && static_n_class_cache_funcs)
{
guint i;
-
- for (i = 0; i < n_class_cache_funcs; i++)
- if (class_cache_funcs[i].cache_func (class_cache_funcs[i].cache_data, node->data->class.class))
- break;
+
+ G_WRITE_UNLOCK (&type_rw_lock);
+ G_READ_LOCK (&type_rw_lock);
+ for (i = 0; i < static_n_class_cache_funcs; i++)
+ {
+ GTypeClassCacheFunc cache_func = static_class_cache_funcs[i].cache_func;
+ gpointer cache_data = static_class_cache_funcs[i].cache_data;
+ gboolean need_break;
+
+ G_READ_UNLOCK (&type_rw_lock);
+ need_break = cache_func (cache_data, node->data->class.class);
+ G_READ_LOCK (&type_rw_lock);
+ if (!node->data || node->data->common.ref_count == 0)
+ INVALID_RECURSION ("GType class cache function ", cache_func, NODE_NAME (node));
+ if (need_break)
+ break;
+ }
+ G_READ_UNLOCK (&type_rw_lock);
+ G_WRITE_LOCK (&type_rw_lock);
}
-
+
if (node->data->common.ref_count > 1) /* may have been re-referenced meanwhile */
node->data->common.ref_count -= 1;
else
if (node->is_classed && tdata->class.class)
{
if (node->n_ifaces)
- type_data_finalize_class_ifaces (node);
+ type_data_finalize_class_ifaces_Wm (node);
node->data = NULL;
- type_data_finalize_class (node, &tdata->class);
+ G_WRITE_UNLOCK (&type_rw_lock);
+ type_data_finalize_class_U (node, &tdata->class);
+ G_WRITE_LOCK (&type_rw_lock);
}
else
node->data = NULL;
-
+
g_free (tdata);
if (ptype)
- type_data_unref (LOOKUP_TYPE_NODE (ptype), FALSE);
+ type_data_unref_Wm (lookup_type_node_L (ptype), FALSE);
+ G_WRITE_UNLOCK (&type_rw_lock);
g_type_plugin_unuse (node->plugin);
+ G_WRITE_LOCK (&type_rw_lock);
}
}
GTypeClassCacheFunc cache_func)
{
guint i;
-
+
g_return_if_fail (cache_func != NULL);
-
- i = n_class_cache_funcs++;
- class_cache_funcs = g_renew (ClassCacheFunc, class_cache_funcs, n_class_cache_funcs);
- class_cache_funcs[i].cache_data = cache_data;
- class_cache_funcs[i].cache_func = cache_func;
+
+ G_WRITE_LOCK (&type_rw_lock);
+ i = static_n_class_cache_funcs++;
+ static_class_cache_funcs = g_renew (ClassCacheFunc, static_class_cache_funcs, static_n_class_cache_funcs);
+ static_class_cache_funcs[i].cache_data = cache_data;
+ static_class_cache_funcs[i].cache_func = cache_func;
+ G_WRITE_UNLOCK (&type_rw_lock);
}
void
g_type_remove_class_cache_func (gpointer cache_data,
GTypeClassCacheFunc cache_func)
{
+ gboolean found_it = FALSE;
guint i;
-
+
g_return_if_fail (cache_func != NULL);
-
- for (i = 0; i < n_class_cache_funcs; i++)
- if (class_cache_funcs[i].cache_data == cache_data &&
- class_cache_funcs[i].cache_func == cache_func)
+
+ G_WRITE_LOCK (&type_rw_lock);
+ for (i = 0; i < static_n_class_cache_funcs; i++)
+ if (static_class_cache_funcs[i].cache_data == cache_data &&
+ static_class_cache_funcs[i].cache_func == cache_func)
{
- n_class_cache_funcs--;
- g_memmove (class_cache_funcs + i,
- class_cache_funcs + i + 1,
- sizeof (class_cache_funcs[0]) * (n_class_cache_funcs - i));
- class_cache_funcs = g_renew (ClassCacheFunc, class_cache_funcs, n_class_cache_funcs);
-
- return;
+ static_n_class_cache_funcs--;
+ g_memmove (static_class_cache_funcs + i,
+ static_class_cache_funcs + i + 1,
+ sizeof (static_class_cache_funcs[0]) * (static_n_class_cache_funcs - i));
+ static_class_cache_funcs = g_renew (ClassCacheFunc, static_class_cache_funcs, static_n_class_cache_funcs);
+ found_it = TRUE;
+ break;
}
-
- g_warning (G_STRLOC ": cannot remove unregistered class cache func %p with data %p",
- cache_func, cache_data);
+ G_WRITE_UNLOCK (&type_rw_lock);
+
+ if (!found_it)
+ g_warning (G_STRLOC ": cannot remove unregistered class cache func %p with data %p",
+ cache_func, cache_data);
}
{
GTypeFundamentalInfo *node_finfo;
TypeNode *node;
-
+
g_return_val_if_fail (type_id > 0, 0);
g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (info != NULL, 0);
g_return_val_if_fail (finfo != NULL, 0);
-
- if (!check_type_name (type_name))
+
+ if (!check_type_name_U (type_name))
return 0;
if (G_TYPE_FUNDAMENTAL (type_id) != type_id)
{
type_id);
return 0;
}
- if (LOOKUP_TYPE_NODE (type_id))
+ if ((finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) &&
+ !(finfo->type_flags & G_TYPE_FLAG_CLASSED))
{
- g_warning ("cannot register existing fundamental type `%s' (as `%s')",
- type_descriptive_name (type_id),
+ g_warning ("cannot register instantiatable fundamental type `%s' as non-classed",
type_name);
return 0;
}
- if ((finfo->type_flags & G_TYPE_FLAG_INSTANTIATABLE) &&
- !(finfo->type_flags & G_TYPE_FLAG_CLASSED))
+ G_WRITE_LOCK (&type_rw_lock);
+ if (lookup_type_node_L (type_id))
{
- g_warning ("cannot register instantiatable fundamental type `%s' as non-classed",
+ G_WRITE_UNLOCK (&type_rw_lock);
+ g_warning ("cannot register existing fundamental type `%s' (as `%s')",
+ type_descriptive_name_U (type_id),
type_name);
return 0;
}
-
- node = type_node_fundamental_new (type_id, type_name, finfo->type_flags);
- node_finfo = type_node_fundamental_info (node);
- type_add_flags (node, flags);
-
- if (!check_type_info (NULL, G_TYPE_FUNDAMENTAL (NODE_TYPE (node)), type_name, info))
- return NODE_TYPE (node);
- type_data_make (node, info,
- check_value_table (type_name, info->value_table) ? info->value_table : NULL);
-
+
+ node = type_node_fundamental_new_W (type_id, type_name, finfo->type_flags);
+ node_finfo = type_node_fundamental_info_L (node);
+ type_add_flags_W (node, flags);
+
+ if (check_type_info_L (NULL, G_TYPE_FUNDAMENTAL (NODE_TYPE (node)), type_name, info))
+ type_data_make_W (node, info,
+ check_value_table_I (type_name, info->value_table) ? info->value_table : NULL);
+ G_WRITE_UNLOCK (&type_rw_lock);
+
return NODE_TYPE (node);
}
GTypeFlags flags)
{
TypeNode *pnode, *node;
- GType type;
+ GType type = 0;
g_return_val_if_fail (parent_type > 0, 0);
g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (info != NULL, 0);
- if (!check_type_name (type_name))
- return 0;
- if (!check_derivation (parent_type, type_name))
- return 0;
-
- pnode = LOOKUP_TYPE_NODE (parent_type);
- type_data_ref (pnode);
-
- if (!check_type_info (pnode, G_TYPE_FUNDAMENTAL (parent_type), type_name, info))
+ if (!check_type_name_U (type_name) ||
+ !check_derivation_U (parent_type, type_name))
return 0;
if (info->class_finalize)
{
type_name);
return 0;
}
-
- node = type_node_new (pnode, type_name, NULL);
- type_add_flags (node, flags);
- type = NODE_TYPE (node);
- type_data_make (node, info,
- check_value_table (type_name, info->value_table) ? info->value_table : NULL);
-
+
+ G_WRITE_LOCK (&type_rw_lock);
+ pnode = lookup_type_node_L (parent_type);
+ type_data_ref_Wm (pnode);
+ if (check_type_info_L (pnode, G_TYPE_FUNDAMENTAL (parent_type), type_name, info))
+ {
+ node = type_node_new_W (pnode, type_name, NULL);
+ type_add_flags_W (node, flags);
+ type = NODE_TYPE (node);
+ type_data_make_W (node, info,
+ check_value_table_I (type_name, info->value_table) ? info->value_table : NULL);
+ }
+ G_WRITE_UNLOCK (&type_rw_lock);
+
return type;
}
{
TypeNode *pnode, *node;
GType type;
-
+
g_return_val_if_fail (parent_type > 0, 0);
g_return_val_if_fail (type_name != NULL, 0);
g_return_val_if_fail (plugin != NULL, 0);
-
- if (!check_type_name (type_name))
- return 0;
- if (!check_derivation (parent_type, type_name))
- return 0;
- if (!check_plugin (plugin, TRUE, FALSE, type_name))
+
+ if (!check_type_name_U (type_name) ||
+ !check_derivation_U (parent_type, type_name) ||
+ !check_plugin_U (plugin, TRUE, FALSE, type_name))
return 0;
- pnode = LOOKUP_TYPE_NODE (parent_type);
-
- node = type_node_new (pnode, type_name, plugin);
- type_add_flags (node, flags);
+
+ G_WRITE_LOCK (&type_rw_lock);
+ pnode = lookup_type_node_L (parent_type);
+ node = type_node_new_W (pnode, type_name, plugin);
+ type_add_flags_W (node, flags);
type = NODE_TYPE (node);
-
+ G_WRITE_UNLOCK (&type_rw_lock);
+
return type;
}
GType interface_type,
const GInterfaceInfo *info)
{
- TypeNode *node;
- TypeNode *iface;
-
+ /* G_TYPE_IS_INSTANTIATABLE() is an external call: _U */
g_return_if_fail (G_TYPE_IS_INSTANTIATABLE (instance_type));
g_return_if_fail (g_type_parent (interface_type) == G_TYPE_INTERFACE);
-
- if (!check_add_interface (instance_type, interface_type))
- return;
- node = LOOKUP_TYPE_NODE (instance_type);
- iface = LOOKUP_TYPE_NODE (interface_type);
- if (!check_interface_info (iface, NODE_TYPE (node), info))
- return;
- type_add_interface (node, iface, info, NULL);
+
+ G_WRITE_LOCK (&type_rw_lock);
+ if (check_add_interface_L (instance_type, interface_type))
+ {
+ TypeNode *node = lookup_type_node_L (instance_type);
+ TypeNode *iface = lookup_type_node_L (interface_type);
+
+ if (check_interface_info_L (iface, NODE_TYPE (node), info))
+ type_add_interface_W (node, iface, info, NULL);
+ }
+ G_WRITE_UNLOCK (&type_rw_lock);
}
void
GTypePlugin *plugin)
{
TypeNode *node;
- TypeNode *iface;
+ /* G_TYPE_IS_INSTANTIATABLE() is an external call: _U */
g_return_if_fail (G_TYPE_IS_INSTANTIATABLE (instance_type));
g_return_if_fail (g_type_parent (interface_type) == G_TYPE_INTERFACE);
-
- if (!check_add_interface (instance_type, interface_type))
- return;
- node = LOOKUP_TYPE_NODE (instance_type);
- iface = LOOKUP_TYPE_NODE (interface_type);
- if (!check_plugin (plugin, FALSE, TRUE, NODE_NAME (node)))
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (instance_type);
+ G_READ_UNLOCK (&type_rw_lock);
+ if (!check_plugin_U (plugin, FALSE, TRUE, NODE_NAME (node)))
return;
- type_add_interface (node, iface, NULL, plugin);
+
+ G_WRITE_LOCK (&type_rw_lock);
+ if (check_add_interface_L (instance_type, interface_type))
+ {
+ TypeNode *iface = lookup_type_node_L (interface_type);
+
+ type_add_interface_W (node, iface, NULL, plugin);
+ }
+ G_WRITE_UNLOCK (&type_rw_lock);
}
gpointer
g_type_class_ref (GType type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
+ TypeNode *node;
+
/* optimize for common code path
*/
+ G_WRITE_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
if (node && node->is_classed && node->data &&
node->data->class.class && node->data->common.ref_count > 0)
{
- type_data_ref (node);
-
+ type_data_ref_Wm (node);
+ G_WRITE_UNLOCK (&type_rw_lock);
+
return node->data->class.class;
}
-
+
if (!node || !node->is_classed ||
(node->data && node->data->common.ref_count < 1))
{
+ G_WRITE_UNLOCK (&type_rw_lock);
g_warning ("cannot retrive class for invalid (unclassed) type `%s'",
- type_descriptive_name (type));
+ type_descriptive_name_U (type));
return NULL;
}
-
- type_data_ref (node);
-
+
+ type_data_ref_Wm (node);
+
if (!node->data->class.class)
{
GType ptype = NODE_PARENT_TYPE (node);
- GTypeClass *pclass = ptype ? g_type_class_ref (ptype) : NULL;
-
- type_class_init (node, pclass);
+ GTypeClass *pclass = NULL;
+
+ if (ptype)
+ {
+ G_WRITE_UNLOCK (&type_rw_lock);
+ pclass = g_type_class_ref (ptype);
+ if (node->data->class.class)
+ INVALID_RECURSION ("g_type_plugin_*", node->plugin, NODE_NAME (node));
+ G_WRITE_LOCK (&type_rw_lock);
+ }
+
+ type_class_init_Wm (node, pclass);
}
-
+ G_WRITE_UNLOCK (&type_rw_lock);
+
return node->data->class.class;
}
{
TypeNode *node;
GTypeClass *class = g_class;
-
+
g_return_if_fail (g_class != NULL);
-
- node = LOOKUP_TYPE_NODE (class->g_type);
+
+ G_WRITE_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (class->g_type);
if (node && node->is_classed && node->data &&
node->data->class.class == class && node->data->common.ref_count > 0)
- type_data_unref (node, FALSE);
+ type_data_unref_Wm (node, FALSE);
else
g_warning ("cannot unreference class of invalid (unclassed) type `%s'",
- type_descriptive_name (class->g_type));
+ type_descriptive_name_L (class->g_type));
+ G_WRITE_UNLOCK (&type_rw_lock);
}
void
{
TypeNode *node;
GTypeClass *class = g_class;
-
+
g_return_if_fail (g_class != NULL);
-
- node = LOOKUP_TYPE_NODE (class->g_type);
+
+ G_WRITE_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (class->g_type);
if (node && node->is_classed && node->data &&
node->data->class.class == class && node->data->common.ref_count > 0)
- type_data_unref (node, TRUE);
+ type_data_unref_Wm (node, TRUE);
else
g_warning ("cannot unreference class of invalid (unclassed) type `%s'",
- type_descriptive_name (class->g_type));
+ type_descriptive_name_L (class->g_type));
+ G_WRITE_UNLOCK (&type_rw_lock);
}
gpointer
g_type_class_peek (GType type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
+ TypeNode *node;
+ gpointer class;
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
if (node && node->is_classed && node->data && node->data->class.class) /* common.ref_count _may_ be 0 */
- return node->data->class.class;
+ class = node->data->class.class;
else
- return NULL;
+ class = NULL;
+ G_READ_UNLOCK (&type_rw_lock);
+
+ return class;
}
gpointer
g_type_class_peek_parent (gpointer g_class)
{
TypeNode *node;
-
+ gpointer class;
+
g_return_val_if_fail (g_class != NULL, NULL);
-
- node = LOOKUP_TYPE_NODE (G_TYPE_FROM_CLASS (g_class));
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (G_TYPE_FROM_CLASS (g_class));
if (node && node->is_classed && node->data && NODE_PARENT_TYPE (node))
{
- node = LOOKUP_TYPE_NODE (NODE_PARENT_TYPE (node));
-
- return node->data->class.class;
+ node = lookup_type_node_L (NODE_PARENT_TYPE (node));
+ class = node->data->class.class;
}
-
- return NULL;
+ else
+ class = NULL;
+ G_READ_UNLOCK (&type_rw_lock);
+
+ return class;
}
gpointer
{
TypeNode *node;
TypeNode *iface;
+ gpointer vtable = NULL;
GTypeClass *class = instance_class;
-
+
g_return_val_if_fail (instance_class != NULL, NULL);
-
- node = LOOKUP_TYPE_NODE (class->g_type);
- iface = LOOKUP_TYPE_NODE (iface_type);
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (class->g_type);
+ iface = lookup_type_node_L (iface_type);
if (node && node->is_instantiatable && iface)
{
- IFaceEntry *entry = type_lookup_iface_entry (node, iface);
-
+ IFaceEntry *entry = type_lookup_iface_entry_L (node, iface);
+
if (entry && entry->vtable)
- return entry->vtable;
+ vtable = entry->vtable;
}
-
- return NULL;
+ G_READ_UNLOCK (&type_rw_lock);
+
+ return vtable;
}
GTypeValueTable*
g_type_value_table_peek (GType type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
- if (node && node->data && node->data->common.ref_count > 0)
- return node->data->common.value_table->value_init ? node->data->common.value_table : NULL;
- else
- return NULL;
+ TypeNode *node;
+ GTypeValueTable *vtable = NULL;
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
+ if (node && node->data && node->data->common.ref_count > 0 &&
+ node->data->common.value_table->value_init)
+ vtable = node->data->common.value_table;
+ G_READ_UNLOCK (&type_rw_lock);
+
+ return vtable;
}
gchar*
g_type_name (GType type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
+ TypeNode *node;
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
+ G_READ_UNLOCK (&type_rw_lock);
return node ? NODE_NAME (node) : NULL;
}
GQuark
g_type_qname (GType type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
+ TypeNode *node;
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
+ G_READ_UNLOCK (&type_rw_lock);
+
return node ? node->qname : 0;
}
GType
g_type_from_name (const gchar *name)
{
+ GType type = 0;
GQuark quark;
g_return_val_if_fail (name != NULL, 0);
quark = g_quark_try_string (name);
if (quark)
{
- GType type = GPOINTER_TO_UINT (g_hash_table_lookup (g_type_nodes_ht, GUINT_TO_POINTER (quark)));
-
- if (type)
- return type;
+ G_READ_LOCK (&type_rw_lock);
+ type = GPOINTER_TO_UINT (g_hash_table_lookup (static_type_nodes_ht, GUINT_TO_POINTER (quark)));
+ G_READ_UNLOCK (&type_rw_lock);
}
- return 0;
+ return type;
}
GType
g_type_parent (GType type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
+ TypeNode *node;
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
+ G_READ_UNLOCK (&type_rw_lock);
+
return node ? NODE_PARENT_TYPE (node) : 0;
}
g_type_next_base (GType type,
GType base_type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
+ GType atype = 0;
+ TypeNode *node;
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
if (node)
{
- TypeNode *base_node = LOOKUP_TYPE_NODE (base_type);
+ TypeNode *base_node = lookup_type_node_L (base_type);
if (base_node && base_node->n_supers < node->n_supers)
{
guint n = node->n_supers - base_node->n_supers;
if (node->supers[n] == base_type)
- return node->supers[n - 1];
+ atype = node->supers[n - 1];
}
}
+ G_READ_UNLOCK (&type_rw_lock);
- return 0;
-}
-
-#if 0
-gboolean
-g_type_is_a (GType type,
- GType is_a_type)
-{
- if (type != is_a_type)
- {
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
- if (node)
- {
- TypeNode *a_node = LOOKUP_TYPE_NODE (is_a_type);
-
- if (a_node && a_node->n_supers <= node->n_supers)
- return node->supers[node->n_supers - a_node->n_supers] == is_a_type;
- }
- }
- else
- return LOOKUP_TYPE_NODE (type) != NULL;
-
- return FALSE;
+ return atype;
}
-#endif
gboolean
g_type_is_a (GType type,
GType iface_type)
{
+ gboolean is_a = FALSE;
+
+ G_READ_LOCK (&type_rw_lock);
if (type != iface_type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
+ TypeNode *node = lookup_type_node_L (type);
+
if (node)
{
- TypeNode *iface_node = LOOKUP_TYPE_NODE (iface_type);
-
+ TypeNode *iface_node = lookup_type_node_L (iface_type);
+
if (iface_node)
{
if (iface_node->is_iface && node->is_instantiatable)
- return type_lookup_iface_entry (node, iface_node) != NULL;
+ is_a = type_lookup_iface_entry_L (node, iface_node) != NULL;
else if (iface_node->n_supers <= node->n_supers)
- return node->supers[node->n_supers - iface_node->n_supers] == iface_type;
+ is_a = node->supers[node->n_supers - iface_node->n_supers] == iface_type;
}
}
}
else
- return LOOKUP_TYPE_NODE (type) != NULL;
-
- return FALSE;
+ is_a = lookup_type_node_L (type) != NULL;
+ G_READ_UNLOCK (&type_rw_lock);
+
+ return is_a;
}
guint
g_type_fundamental_branch_last (GType type)
{
GType ftype = G_TYPE_FUNDAMENTAL (type);
-
- return ftype < last_fundamental_id ? g_branch_seqnos[ftype] : 0;
+ 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 */
g_type_children (GType type,
guint *n_children)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
+ TypeNode *node;
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
if (node)
{
GType *children = g_new (GType, node->n_children + 1);
if (n_children)
*n_children = node->n_children;
+ G_READ_UNLOCK (&type_rw_lock);
return children;
}
else
{
+ G_READ_UNLOCK (&type_rw_lock);
if (n_children)
*n_children = 0;
g_type_interfaces (GType type,
guint *n_interfaces)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
+ TypeNode *node;
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
if (node && node->is_instantiatable)
{
GType *ifaces = g_new (GType, node->n_ifaces + 1);
guint i;
-
+
for (i = 0; i < node->n_ifaces; i++)
ifaces[i] = node->private.iface_entries[i].iface_type;
ifaces[i] = 0;
-
+
if (n_interfaces)
*n_interfaces = node->n_ifaces;
-
+ G_READ_UNLOCK (&type_rw_lock);
+
return ifaces;
}
else
{
+ G_READ_UNLOCK (&type_rw_lock);
if (n_interfaces)
*n_interfaces = 0;
-
+
return NULL;
}
}
gpointer data;
};
-gpointer
-g_type_get_qdata (GType type,
- GQuark quark)
+static inline gpointer
+type_get_qdata_L (TypeNode *node,
+ GQuark quark)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
- GData *gdata;
+ GData *gdata = node->global_gdata;
- g_return_val_if_fail (node != NULL, NULL);
-
- gdata = node->static_gdata;
if (quark && gdata && gdata->n_qdatas)
{
QData *qdatas = gdata->qdatas - 1;
guint n_qdatas = gdata->n_qdatas;
-
+
do
{
guint i;
QData *check;
-
+
i = (n_qdatas + 1) / 2;
check = qdatas + i;
if (quark == check->quark)
}
while (n_qdatas);
}
-
return NULL;
}
-void
-g_type_set_qdata (GType type,
- GQuark quark,
- gpointer data)
+gpointer
+g_type_get_qdata (GType type,
+ GQuark quark)
+{
+ TypeNode *node;
+ gpointer data;
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
+ if (node)
+ {
+ data = type_get_qdata_L (node, quark);
+ G_READ_UNLOCK (&type_rw_lock);
+ }
+ else
+ {
+ G_READ_UNLOCK (&type_rw_lock);
+ g_return_val_if_fail (node != NULL, NULL);
+ data = NULL;
+ }
+ return data;
+}
+
+static inline void
+type_set_qdata_W (TypeNode *node,
+ GQuark quark,
+ gpointer data)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
GData *gdata;
QData *qdata;
guint i;
-
- g_return_if_fail (node != NULL);
- g_return_if_fail (quark != 0);
-
+
/* setup qdata list if necessary */
- if (!node->static_gdata)
- node->static_gdata = g_new0 (GData, 1);
- gdata = node->static_gdata;
-
+ if (!node->global_gdata)
+ node->global_gdata = g_new0 (GData, 1);
+ gdata = node->global_gdata;
+
/* try resetting old data */
qdata = gdata->qdatas;
for (i = 0; i < gdata->n_qdatas; i++)
qdata[i].data = data;
return;
}
-
+
/* add new entry */
gdata->n_qdatas++;
gdata->qdatas = g_renew (QData, gdata->qdatas, gdata->n_qdatas);
qdata[i].data = data;
}
+void
+g_type_set_qdata (GType type,
+ GQuark quark,
+ gpointer data)
+{
+ TypeNode *node;
+
+ g_return_if_fail (quark != 0);
+
+ G_WRITE_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
+ if (node)
+ {
+ type_set_qdata_W (node, quark, data);
+ G_WRITE_UNLOCK (&type_rw_lock);
+ }
+ else
+ {
+ G_WRITE_UNLOCK (&type_rw_lock);
+ g_return_if_fail (node != NULL);
+ }
+}
+
+static void
+type_add_flags_W (TypeNode *node,
+ GTypeFlags flags)
+{
+ guint dflags;
+
+ g_return_if_fail ((flags & ~TYPE_FLAG_MASK) == 0);
+ g_return_if_fail (node != NULL);
+
+ if ((flags & G_TYPE_FLAG_ABSTRACT) && node->is_classed && node->data && node->data->class.class)
+ g_warning ("tagging type `%s' as abstract after class initialization", NODE_NAME (node));
+ dflags = GPOINTER_TO_UINT (type_get_qdata_L (node, static_quark_type_flags));
+ dflags |= flags;
+ type_set_qdata_W (node, static_quark_type_flags, GUINT_TO_POINTER (dflags));
+}
+
/* --- implementation details --- */
gboolean
g_type_check_flags (GType type,
guint flags)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
+ TypeNode *node;
gboolean result = FALSE;
-
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
if (node)
{
guint fflags = flags & TYPE_FUNDAMENTAL_FLAG_MASK;
guint tflags = flags & TYPE_FLAG_MASK;
-
+
if (fflags)
{
- GTypeFundamentalInfo *finfo = type_node_fundamental_info (node);
+ GTypeFundamentalInfo *finfo = type_node_fundamental_info_L (node);
fflags = (finfo->type_flags & fflags) == fflags;
}
fflags = TRUE;
if (tflags)
- tflags = (tflags & GPOINTER_TO_UINT (g_type_get_qdata (type, quark_type_flags))) == tflags;
+ tflags = (tflags & GPOINTER_TO_UINT (type_get_qdata_L (node, static_quark_type_flags))) == tflags;
else
tflags = TRUE;
result = tflags && fflags;
}
+ G_READ_UNLOCK (&type_rw_lock);
+
return result;
}
GTypePlugin*
g_type_get_plugin (GType type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (type);
-
+ TypeNode *node;
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (type);
+ G_READ_UNLOCK (&type_rw_lock);
+
return node ? node->plugin : NULL;
}
g_type_interface_get_plugin (GType instance_type,
GType interface_type)
{
- TypeNode *node = LOOKUP_TYPE_NODE (instance_type);
- TypeNode *iface = LOOKUP_TYPE_NODE (interface_type);
- IFaceHolder *iholder;
-
- g_return_val_if_fail (node == NULL, NULL);
- g_return_val_if_fail (iface == NULL, NULL);
- g_return_val_if_fail (G_TYPE_IS_INTERFACE (interface_type), NULL);
+ TypeNode *node;
+ TypeNode *iface;
- iholder = iface->private.iface_conformants;
+ g_return_val_if_fail (G_TYPE_IS_INTERFACE (interface_type), NULL);
- while (iholder && iholder->instance_type != instance_type)
- iholder = iholder->next;
-
- if (!iholder)
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (instance_type);
+ iface = lookup_type_node_L (interface_type);
+ if (node && iface)
{
- g_warning (G_STRLOC ": Attempt to look up plugin for invalid instance/interface type pair.");
- return NULL;
+ IFaceHolder *iholder = iface->private.iface_conformants;
+
+ while (iholder && iholder->instance_type != instance_type)
+ iholder = iholder->next;
+ G_READ_UNLOCK (&type_rw_lock);
+
+ if (iholder)
+ return iholder->plugin;
}
-
- return iholder->plugin;
+ else
+ G_READ_UNLOCK (&type_rw_lock);
+
+ g_return_val_if_fail (node == NULL, NULL);
+ g_return_val_if_fail (iface == NULL, NULL);
+
+ g_warning (G_STRLOC ": attempt to look up plugin for invalid instance/interface type pair.");
+
+ return NULL;
}
GType
g_type_fundamental_last (void)
{
- return last_fundamental_id;
+ GType type;
+
+ G_READ_LOCK (&type_rw_lock);
+ type = static_last_fundamental_id;
+ G_READ_UNLOCK (&type_rw_lock);
+
+ return type;
}
gboolean
g_type_instance_is_a (GTypeInstance *type_instance,
GType iface_type)
{
+ /* G_TYPE_IS_INSTANTIATABLE() is an external call: _U */
return (type_instance && type_instance->g_class &&
G_TYPE_IS_INSTANTIATABLE (type_instance->g_class->g_type) &&
g_type_is_a (type_instance->g_class->g_type, iface_type));
g_type_class_is_a (GTypeClass *type_class,
GType is_a_type)
{
+ /* G_TYPE_IS_CLASSED() is an external call: _U */
return (type_class && G_TYPE_IS_CLASSED (type_class->g_type) &&
g_type_is_a (type_class->g_type, is_a_type));
}
if (!value)
return FALSE;
- node = LOOKUP_TYPE_NODE (value->g_type);
+
+ G_READ_LOCK (&type_rw_lock);
+ node = lookup_type_node_L (value->g_type);
#if 0
if (!G_TYPE_IS_FUNDAMENTAL (value->g_type) && !node || !node->data)
- node = LOOKUP_TYPE_NODE (G_TYPE_FUNDAMENTAL (value->g_type));
+ node = lookup_type_node_L (G_TYPE_FUNDAMENTAL (value->g_type));
#endif
if (!node || !node->data || node->data->common.ref_count < 1 ||
- !node->data->common.value_table->value_init ||
- !g_type_is_a (value->g_type, type))
- return FALSE;
+ !node->data->common.value_table->value_init)
+ {
+ G_READ_UNLOCK (&type_rw_lock);
+
+ return FALSE;
+ }
+ G_READ_UNLOCK (&type_rw_lock);
- return TRUE;
+ return g_type_is_a (value->g_type, type);
}
gboolean
if (!type_instance)
{
g_warning ("invalid cast from (NULL) pointer to `%s'",
- type_descriptive_name (iface_type));
+ type_descriptive_name_U (iface_type));
return type_instance;
}
if (!type_instance->g_class)
{
g_warning ("invalid unclassed pointer in cast to `%s'",
- type_descriptive_name (iface_type));
+ type_descriptive_name_U (iface_type));
return type_instance;
}
+ /* G_TYPE_IS_INSTANTIATABLE() is an external call: _U */
if (!G_TYPE_IS_INSTANTIATABLE (type_instance->g_class->g_type))
{
g_warning ("invalid uninstantiatable type `%s' in cast to `%s'",
- type_descriptive_name (type_instance->g_class->g_type),
- type_descriptive_name (iface_type));
+ type_descriptive_name_U (type_instance->g_class->g_type),
+ type_descriptive_name_U (iface_type));
return type_instance;
}
if (!g_type_is_a (type_instance->g_class->g_type, iface_type))
{
g_warning ("invalid cast from `%s' to `%s'",
- type_descriptive_name (type_instance->g_class->g_type),
- type_descriptive_name (iface_type));
+ type_descriptive_name_U (type_instance->g_class->g_type),
+ type_descriptive_name_U (iface_type));
return type_instance;
}
-
+
return type_instance;
}
if (!type_class)
{
g_warning ("invalid class cast from (NULL) pointer to `%s'",
- type_descriptive_name (is_a_type));
+ type_descriptive_name_U (is_a_type));
return type_class;
}
+ /* G_TYPE_IS_CLASSED() is an external call: _U */
if (!G_TYPE_IS_CLASSED (type_class->g_type))
{
g_warning ("invalid unclassed type `%s' in class cast to `%s'",
- type_descriptive_name (type_class->g_type),
- type_descriptive_name (is_a_type));
+ type_descriptive_name_U (type_class->g_type),
+ type_descriptive_name_U (is_a_type));
return type_class;
}
if (!g_type_is_a (type_class->g_type, is_a_type))
{
g_warning ("invalid class cast from `%s' to `%s'",
- type_descriptive_name (type_class->g_type),
- type_descriptive_name (is_a_type));
+ type_descriptive_name_U (type_class->g_type),
+ type_descriptive_name_U (is_a_type));
return type_class;
}
-
+
return type_class;
}
g_warning ("instance with invalid (NULL) class pointer");
return FALSE;
}
+ /* G_TYPE_IS_CLASSED() is an external call: _U */
if (!G_TYPE_IS_CLASSED (type_instance->g_class->g_type))
{
g_warning ("instance of invalid unclassed type `%s'",
- type_descriptive_name (type_instance->g_class->g_type));
+ type_descriptive_name_U (type_instance->g_class->g_type));
return FALSE;
}
+ /* G_TYPE_IS_INSTANTIATABLE() is an external call: _U */
if (!G_TYPE_IS_INSTANTIATABLE (type_instance->g_class->g_type))
{
g_warning ("instance of invalid non-instantiatable type `%s'",
- type_descriptive_name (type_instance->g_class->g_type));
+ type_descriptive_name_U (type_instance->g_class->g_type));
return FALSE;
}
-
+
return TRUE;
}
void
g_type_init (void)
{
+ G_LOCK_DEFINE_STATIC (type_init_lock);
static TypeNode *type0_node = NULL;
GTypeInfo info;
TypeNode *node;
GType type;
-
- if (last_fundamental_id)
- return;
-
+
+ G_LOCK (type_init_lock);
+
+ G_WRITE_LOCK (&type_rw_lock);
+
+ if (static_last_fundamental_id)
+ {
+ G_WRITE_UNLOCK (&type_rw_lock);
+ G_UNLOCK (type_init_lock);
+ return;
+ }
+
+ /* quarks */
+ static_quark_type_flags = g_quark_from_static_string ("GTypeFlags");
+
/* type qname hash table */
- g_type_nodes_ht = g_hash_table_new (g_direct_hash, g_direct_equal);
-
+ static_type_nodes_ht = g_hash_table_new (g_direct_hash, g_direct_equal);
+
/* invalid type G_TYPE_INVALID (0)
*/
- last_fundamental_id = 1;
- g_type_nodes = g_renew (TypeNode**, g_type_nodes, last_fundamental_id);
- g_type_nodes[0] = &type0_node;
- g_branch_seqnos = g_renew (GType, g_branch_seqnos, last_fundamental_id);
- g_branch_seqnos[0] = 1;
-
+ static_last_fundamental_id = 1;
+ 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
*/
- node = type_node_fundamental_new (G_TYPE_NONE, "void", 0);
+ node = type_node_fundamental_new_W (G_TYPE_NONE, "void", 0);
type = NODE_TYPE (node);
g_assert (type == G_TYPE_NONE);
-
+
/* interface fundamental type G_TYPE_INTERFACE (!classed)
*/
memset (&info, 0, sizeof (info));
- node = type_node_fundamental_new (G_TYPE_INTERFACE, "GInterface", G_TYPE_FLAG_DERIVABLE);
+ node = type_node_fundamental_new_W (G_TYPE_INTERFACE, "GInterface", G_TYPE_FLAG_DERIVABLE);
type = NODE_TYPE (node);
- type_data_make (node, &info, NULL);
+ type_data_make_W (node, &info, NULL);
g_assert (type == G_TYPE_INTERFACE);
-
+
+ G_WRITE_UNLOCK (&type_rw_lock);
+
/* G_TYPE_TYPE_PLUGIN
*/
g_type_plugin_get_type ();
-
+
/* G_TYPE_* value types
*/
g_value_types_init ();
/* G_TYPE_PARAM
*/
g_param_type_init ();
-
+
/* G_TYPE_PARAM
*/
g_boxed_type_init ();
-
+
/* G_TYPE_OBJECT
*/
g_object_type_init ();
-
+
/* G_TYPE_PARAM_* pspec types
*/
g_param_spec_types_init ();
-
+
/* Signal system
*/
g_signal_init ();
+
+ G_UNLOCK (type_init_lock);
}
projects / platform / upstream / glib.git / commitdiff