X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fvatomic.h;h=831ea0431a00777f724e4dc9587a263d20d31b47;hb=4fbf9cd1ede72e98638a5f81ecdce11416b4afea;hp=b944dd63472f25e4dbc653ce91955271abede0aa;hpb=852c29366c62c78f78af261f0287afcd92eae6b5;p=lttng-ust.git

diff --git a/libringbuffer/vatomic.h b/libringbuffer/vatomic.h
index b944dd63..831ea043 100644
--- a/libringbuffer/vatomic.h
+++ b/libringbuffer/vatomic.h
@@ -9,8 +9,8 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#include <asm/atomic.h>
-#include <asm/local.h>
+#include <assert.h>
+#include <urcu/uatomic.h>
 
 /*
  * Same data type (long) accessed differently depending on configuration.
@@ -21,46 +21,37 @@
  * atomic_long_t is used for globally shared buffers.
  */
 union v_atomic {
-	local_t l;
-	atomic_long_t a;
+	long a;	/* accessed through uatomic */
 	long v;
 };
 
 static inline
 long v_read(const struct lib_ring_buffer_config *config, union v_atomic *v_a)
 {
-	if (config->sync == RING_BUFFER_SYNC_PER_CPU)
-		return local_read(&v_a->l);
-	else
-		return atomic_long_read(&v_a->a);
+	assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
+	return uatomic_read(&v_a->a);
 }
 
 static inline
 void v_set(const struct lib_ring_buffer_config *config, union v_atomic *v_a,
 	   long v)
 {
-	if (config->sync == RING_BUFFER_SYNC_PER_CPU)
-		local_set(&v_a->l, v);
-	else
-		atomic_long_set(&v_a->a, v);
+	assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
+	uatomic_set(&v_a->a, v);
 }
 
 static inline
 void v_add(const struct lib_ring_buffer_config *config, long v, union v_atomic *v_a)
 {
-	if (config->sync == RING_BUFFER_SYNC_PER_CPU)
-		local_add(v, &v_a->l);
-	else
-		atomic_long_add(v, &v_a->a);
+	assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
+	uatomic_add(&v_a->a, v);
 }
 
 static inline
 void v_inc(const struct lib_ring_buffer_config *config, union v_atomic *v_a)
 {
-	if (config->sync == RING_BUFFER_SYNC_PER_CPU)
-		local_inc(&v_a->l);
-	else
-		atomic_long_inc(&v_a->a);
+	assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
+	uatomic_inc(&v_a->a);
 }
 
 /*
@@ -76,10 +67,8 @@ static inline
 long v_cmpxchg(const struct lib_ring_buffer_config *config, union v_atomic *v_a,
 	       long old, long _new)
 {
-	if (config->sync == RING_BUFFER_SYNC_PER_CPU)
-		return local_cmpxchg(&v_a->l, old, _new);
-	else
-		return atomic_long_cmpxchg(&v_a->a, old, _new);
+	assert(config->sync != RING_BUFFER_SYNC_PER_CPU);
+	return uatomic_cmpxchg(&v_a->a, old, _new);
 }
 
 #endif /* _LINUX_RING_BUFFER_VATOMIC_H */