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

Make all accesses of Node->ref_count atomic

Browse Source 
This does not change any locking behavior at all, it just replaces
simple getters/setters of the variable with atomic versions.

The ref_count variable was kept as unsigned, even though that requires
casting for all operations, to mirror GObject->refcount.

https://bugzilla.gnome.org/show_bug.cgi?id=585375
This commit is contained in:
Edward Hervey 2009-09-24 11:38:49 +02:00 committed by Alexander Larsson
parent 2ec989902b
commit 5e7dba0501
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gobject/gtype.c
View File

@ -252,7 +252,7 @@ struct _TypeNode
#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_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_REFCOUNT(node) (node->ref_count) #define NODE_REFCOUNT(node) ((guint) g_atomic_int_get ((int *) &(node)->ref_count))
#define NODE_IS_IFACE(node) (NODE_FUNDAMENTAL_TYPE (node) == G_TYPE_INTERFACE) #define NODE_IS_IFACE(node) (NODE_FUNDAMENTAL_TYPE (node) == G_TYPE_INTERFACE)
#define CLASSED_NODE_IFACES_ENTRIES(node) (&(node)->_prot.iface_entries) #define CLASSED_NODE_IFACES_ENTRIES(node) (&(node)->_prot.iface_entries)
#define CLASSED_NODE_IFACES_ENTRIES_LOCKED(node)(G_ATOMIC_ARRAY_GET_LOCKED(CLASSED_NODE_IFACES_ENTRIES((node)), IFaceEntries)) #define CLASSED_NODE_IFACES_ENTRIES_LOCKED(node)(G_ATOMIC_ARRAY_GET_LOCKED(CLASSED_NODE_IFACES_ENTRIES((node)), IFaceEntries))
@ -1159,7 +1159,7 @@ type_data_make_W (TypeNode *node,
g_assert (node->data->common.value_table != NULL); /* paranoid */ g_assert (node->data->common.value_table != NULL); /* paranoid */
node->ref_count = 1; g_atomic_int_set ((int *) &node->ref_count, 1);
} }
static inline void static inline void
@ -1199,7 +1199,7 @@ type_data_ref_Wm (TypeNode *node)
{ {
g_assert (NODE_REFCOUNT (node) > 0); g_assert (NODE_REFCOUNT (node) > 0);
node->ref_count += 1; g_atomic_int_inc ((int *) &node->ref_count);
} }
} }
@ -2287,8 +2287,7 @@ type_data_last_unref_Wm (TypeNode *node,
} }
/* may have been re-referenced meanwhile */ /* may have been re-referenced meanwhile */
node->ref_count -= 1; if (g_atomic_int_dec_and_test ((int *) &node->ref_count))
if (NODE_REFCOUNT (node) == 0)
{ {
GType ptype = NODE_PARENT_TYPE (node); GType ptype = NODE_PARENT_TYPE (node);
TypeData *tdata; TypeData *tdata;
@ -2350,7 +2349,7 @@ type_data_unref_U (TypeNode *node,
G_WRITE_LOCK (&type_rw_lock); G_WRITE_LOCK (&type_rw_lock);
g_assert (node->data && NODE_REFCOUNT (node) > 0); g_assert (node->data && NODE_REFCOUNT (node) > 0);
if (NODE_REFCOUNT (node) > 1) if (NODE_REFCOUNT (node) > 1)
node->ref_count -= 1; g_atomic_int_add ((int *) &node->ref_count, -1);
else else
{ {
if (!node->plugin) if (!node->plugin)