diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2018-01-17 17:01:52 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2018-06-11 14:59:39 +0100 |
| commit | e67e4cb8496e6ba66832319ab89d288219acdca5 (patch) | |
| tree | c6ff5cd3feaebdc8964bcb03ec22ad6688860cf4 | |
| parent | 439ee4822e9f5fe3e191ee8b38efe6cae4076787 (diff) | |
| download | glib-e67e4cb8496e6ba66832319ab89d288219acdca5.tar.gz | |
Port GBytes to gatomicrefcount
Use the newly added API for reference counting instead of rolling our
own.
| -rw-r--r-- | glib/gbytes.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/glib/gbytes.c b/glib/gbytes.c index 3b14a51cd..74f8148f6 100644 --- a/glib/gbytes.c +++ b/glib/gbytes.c @@ -30,6 +30,7 @@ #include <glib/gtestutils.h> #include <glib/gmem.h> #include <glib/gmessages.h> +#include <glib/grefcount.h> #include <string.h> @@ -69,7 +70,7 @@ struct _GBytes { gconstpointer data; /* may be NULL iff (size == 0) */ gsize size; /* may be 0 */ - gint ref_count; + gatomicrefcount ref_count; GDestroyNotify free_func; gpointer user_data; }; @@ -187,7 +188,7 @@ g_bytes_new_with_free_func (gconstpointer data, bytes->size = size; bytes->free_func = free_func; bytes->user_data = user_data; - bytes->ref_count = 1; + g_atomic_ref_count_init (&bytes->ref_count); return (GBytes *)bytes; } @@ -310,7 +311,7 @@ g_bytes_ref (GBytes *bytes) { g_return_val_if_fail (bytes != NULL, NULL); - g_atomic_int_inc (&bytes->ref_count); + g_atomic_ref_count_inc (&bytes->ref_count); return bytes; } @@ -330,7 +331,7 @@ g_bytes_unref (GBytes *bytes) if (bytes == NULL) return; - if (g_atomic_int_dec_and_test (&bytes->ref_count)) + if (g_atomic_ref_count_dec (&bytes->ref_count)) { if (bytes->free_func != NULL) bytes->free_func (bytes->user_data); @@ -438,7 +439,7 @@ try_steal_and_unref (GBytes *bytes, return NULL; /* Are we the only reference? */ - if (g_atomic_int_get (&bytes->ref_count) == 1) + if (g_atomic_ref_count_compare (&bytes->ref_count, 1)) { *size = bytes->size; result = (gpointer)bytes->data; |