luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 00:16:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port GBytes to gatomicrefcount

Browse Source 
Use the newly added API for reference counting instead of rolling our
own.
This commit is contained in:
Emmanuele Bassi 2018-01-17 17:01:52 +00:00
parent 439ee4822e
commit e67e4cb849
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glib/gbytes.c
View File

@ -30,6 +30,7 @@
#include <glib/gtestutils.h> #include <glib/gtestutils.h>
#include <glib/gmem.h> #include <glib/gmem.h>
#include <glib/gmessages.h> #include <glib/gmessages.h>
#include <glib/grefcount.h>
#include <string.h> #include <string.h>
@ -69,7 +70,7 @@ struct _GBytes
{ {
gconstpointer data; /* may be NULL iff (size == 0) */ gconstpointer data; /* may be NULL iff (size == 0) */
gsize size; /* may be 0 */ gsize size; /* may be 0 */
gint ref_count; gatomicrefcount ref_count;
GDestroyNotify free_func; GDestroyNotify free_func;
gpointer user_data; gpointer user_data;
}; };
@ -187,7 +188,7 @@ g_bytes_new_with_free_func (gconstpointer data,
bytes->size = size; bytes->size = size;
bytes->free_func = free_func; bytes->free_func = free_func;
bytes->user_data = user_data; bytes->user_data = user_data;
bytes->ref_count = 1; g_atomic_ref_count_init (&bytes->ref_count);
return (GBytes *)bytes; return (GBytes *)bytes;
} }
@ -310,7 +311,7 @@ g_bytes_ref (GBytes *bytes)
{ {
g_return_val_if_fail (bytes != NULL, NULL); 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; return bytes;
} }
@ -330,7 +331,7 @@ g_bytes_unref (GBytes *bytes)
if (bytes == NULL) if (bytes == NULL)
return; 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) if (bytes->free_func != NULL)
bytes->free_func (bytes->user_data); bytes->free_func (bytes->user_data);
@ -438,7 +439,7 @@ try_steal_and_unref (GBytes *bytes,
return NULL; return NULL;
/* Are we the only reference? */ /* 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; *size = bytes->size;
result = (gpointer)bytes->data; result = (gpointer)bytes->data;