diff options
author | Colin Walters <walters@verbum.org> | 2012-11-19 21:42:44 -0500 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2013-04-02 12:10:33 -0400 |
commit | 4b1bf70c93acb3446c1e9049ac422d911a10762d (patch) | |
tree | 8e907416cbc06a272e9e999a8b05e87e6a2fefab /girepository/gibaseinfo.c | |
parent | 49b80bb567115b95c1051d2f01da7679e4e08154 (diff) | |
download | gobject-introspection-4b1bf70c93acb3446c1e9049ac422d911a10762d.tar.gz |
girepository: Use g_atomic for refcounting
They could be freed in separate threads (e.g. language binding GC
thread). But no particular reason to change other than noticing it
during code inspection for a different bug.
https://bugzilla.gnome.org/show_bug.cgi?id=688694
Diffstat (limited to 'girepository/gibaseinfo.c')
-rw-r--r-- | girepository/gibaseinfo.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c index ff9c9395..37893e6c 100644 --- a/girepository/gibaseinfo.c +++ b/girepository/gibaseinfo.c @@ -226,7 +226,7 @@ g_base_info_ref (GIBaseInfo *info) GIRealInfo *rinfo = (GIRealInfo*)info; g_assert (rinfo->ref_count != INVALID_REFCOUNT); - ((GIRealInfo*)info)->ref_count++; + g_atomic_int_inc (&rinfo->ref_count); return info; } @@ -244,21 +244,20 @@ g_base_info_unref (GIBaseInfo *info) GIRealInfo *rinfo = (GIRealInfo*)info; g_assert (rinfo->ref_count > 0 && rinfo->ref_count != INVALID_REFCOUNT); - rinfo->ref_count--; - if (!rinfo->ref_count) - { - if (rinfo->container && ((GIRealInfo *) rinfo->container)->ref_count != INVALID_REFCOUNT) - g_base_info_unref (rinfo->container); + if (!g_atomic_int_dec_and_test (&rinfo->ref_count)) + return; - if (rinfo->repository) - g_object_unref (rinfo->repository); + if (rinfo->container && ((GIRealInfo *) rinfo->container)->ref_count != INVALID_REFCOUNT) + g_base_info_unref (rinfo->container); - if (rinfo->type == GI_INFO_TYPE_UNRESOLVED) - g_slice_free (GIUnresolvedInfo, (GIUnresolvedInfo *) rinfo); - else - g_slice_free (GIRealInfo, rinfo); - } + if (rinfo->repository) + g_object_unref (rinfo->repository); + + if (rinfo->type == GI_INFO_TYPE_UNRESOLVED) + g_slice_free (GIUnresolvedInfo, (GIUnresolvedInfo *) rinfo); + else + g_slice_free (GIRealInfo, rinfo); } /** |