korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-03 09:04:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

attrib: Use gcc builtin instead of g_atomic

Browse Source 
g_atomic_* end up using G_STATIC_ASSERT, causing gcc 4.8 to yell due to
-Wunused-local-typedefs.

/usr/include/glib-2.0/glib/gmacros.h:162:53: error: typedef ‘_GStaticAssertCompileTimeAssertion_2’ locally defined but not used [-Werror=unused-local-typedefs]
 #define G_STATIC_ASSERT(expr) typedef char G_PASTE (_GStaticAssertCompileTimeAssertion_, __COUNTER__)[(expr) ? 1 : -1]

Most of the uses of atomic operations were wrong. They were fixed as
well. If we are using atomic operations, reading the variable again
later for logging is not an option, we should use the return of the
atomic function used to fetch the variable.
This commit is contained in:
Lucas De Marchi 2013-04-08 17:56:19 -03:00 committed by Johan Hedberg
parent 38669d6e86
commit 1bd26421ce
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
attrib/gatt.c
View File

@ -79,14 +79,14 @@ static void discover_primary_free(struct discover_primary *dp)
static struct included_discovery *isd_ref(struct included_discovery *isd)
{
g_atomic_int_inc(&isd->refs);
__sync_fetch_and_add(&isd->refs, 1);
return isd;
}
static void isd_unref(struct included_discovery *isd)
{
if (g_atomic_int_dec_and_test(&isd->refs) == FALSE)
if (__sync_sub_and_fetch(&isd->refs, 1) > 0)
return;
if (isd->err)
@ -582,7 +582,7 @@ static void read_long_destroy(gpointer user_data)
{
struct read_long_data *long_read = user_data;
if (g_atomic_int_dec_and_test(&long_read->ref) == FALSE)
if (__sync_sub_and_fetch(&long_read->ref, 1) > 0)
return;
if (long_read->buffer != NULL)
@ -627,7 +627,7 @@ static void read_blob_helper(guint8 status, const guint8 *rpdu, guint16 rlen,
read_blob_helper, long_read, read_long_destroy);
if (id != 0) {
g_atomic_int_inc(&long_read->ref);
__sync_fetch_and_add(&long_read->ref, 1);
return;
}
@ -664,7 +664,7 @@ static void read_char_helper(guint8 status, const guint8 *rpdu,
id = g_attrib_send(long_read->attrib, long_read->id, buf, plen,
read_blob_helper, long_read, read_long_destroy);
if (id != 0) {
g_atomic_int_inc(&long_read->ref);
__sync_fetch_and_add(&long_read->ref, 1);
return;
}
@ -700,7 +700,7 @@ guint gatt_read_char(GAttrib *attrib, uint16_t handle, GAttribResultFunc func,
if (id == 0)
g_free(long_read);
else {
g_atomic_int_inc(&long_read->ref);
__sync_fetch_and_add(&long_read->ref, 1);
long_read->id = id;
}

14
attrib/gattrib.c
View File

@ -147,12 +147,14 @@ static gboolean is_response(guint8 opcode)
GAttrib *g_attrib_ref(GAttrib *attrib)
{
int refs;
if (!attrib)
return NULL;
g_atomic_int_inc(&attrib->refs);
refs = __sync_add_and_fetch(&attrib->refs, 1);
DBG("%p: ref=%d", attrib, attrib->refs);
DBG("%p: ref=%d", attrib, refs);
return attrib;
}
@ -219,16 +221,16 @@ static void attrib_destroy(GAttrib *attrib)
void g_attrib_unref(GAttrib *attrib)
{
gboolean ret;
int refs;
if (!attrib)
return;
ret = g_atomic_int_dec_and_test(&attrib->refs);
refs = __sync_sub_and_fetch(&attrib->refs, 1);
DBG("%p: ref=%d", attrib, attrib->refs);
DBG("%p: ref=%d", attrib, refs);
if (ret == FALSE)
if (refs > 0)
return;
attrib_destroy(attrib);