From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 8 May 2012 21:07:03 +0000 (-0400)
Subject: API cleanup: use "uatomic_*" in cmm_smp_mb__ API
X-Git-Tag: v0.6.9~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3616704a6e89cf5cd3d9033a89ecce9906b9a305;p=userspace-rcu.git

API cleanup: use "uatomic_*" in cmm_smp_mb__ API

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/urcu/uatomic/generic.h b/urcu/uatomic/generic.h
index 4ef71c7..bfd9b68 100644
--- a/urcu/uatomic/generic.h
+++ b/urcu/uatomic/generic.h
@@ -122,8 +122,8 @@ void _uatomic_and(void *addr, unsigned long val,
 	(_uatomic_and((addr),			\
 		caa_cast_long_keep_sign(v),	\
 		sizeof(*(addr))))
-#define cmm_smp_mb__before_and()	cmm_barrier()
-#define cmm_smp_mb__after_and()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_and()	cmm_barrier()
+#define cmm_smp_mb__after_uatomic_and()		cmm_barrier()
 
 #endif
 
@@ -162,8 +162,8 @@ void _uatomic_or(void *addr, unsigned long val,
 	(_uatomic_or((addr),			\
 		caa_cast_long_keep_sign(v),	\
 		sizeof(*(addr))))
-#define cmm_smp_mb__before_or()		cmm_barrier()
-#define cmm_smp_mb__after_or()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_or()		cmm_barrier()
+#define cmm_smp_mb__after_uatomic_or()		cmm_barrier()
 
 #endif
 
@@ -335,8 +335,8 @@ void _uatomic_and(void *addr, unsigned long val, int len)
 	(_uatomic_and((addr),			\
 		caa_cast_long_keep_sign(v),	\
 		sizeof(*(addr))))
-#define cmm_smp_mb__before_and()	cmm_barrier()
-#define cmm_smp_mb__after_and()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_and()	cmm_barrier()
+#define cmm_smp_mb__after_uatomic_and()		cmm_barrier()
 
 #endif /* #ifndef uatomic_and */
 
@@ -409,8 +409,8 @@ void _uatomic_or(void *addr, unsigned long val, int len)
 	(_uatomic_or((addr),			\
 		caa_cast_long_keep_sign(v),	\
 		sizeof(*(addr))))
-#define cmm_smp_mb__before_or()		cmm_barrier()
-#define cmm_smp_mb__after_or()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_or()		cmm_barrier()
+#define cmm_smp_mb__after_uatomic_or()		cmm_barrier()
 
 #endif /* #ifndef uatomic_or */
 
@@ -572,27 +572,27 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 
 #ifndef uatomic_add
 #define uatomic_add(addr, v)		(void)uatomic_add_return((addr), (v))
-#define cmm_smp_mb__before_add()	cmm_barrier()
-#define cmm_smp_mb__after_add()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_add()	cmm_barrier()
+#define cmm_smp_mb__after_uatomic_add()		cmm_barrier()
 #endif
 
 #define uatomic_sub_return(addr, v)	\
 	uatomic_add_return((addr), -(caa_cast_long_keep_sign(v)))
 #define uatomic_sub(addr, v)		\
 	uatomic_add((addr), -(caa_cast_long_keep_sign(v)))
-#define cmm_smp_mb__before_sub()	cmm_smp_mb__before_add()
-#define cmm_smp_mb__after_sub()		cmm_smp_mb__after_add()
+#define cmm_smp_mb__before_uatomic_sub()	cmm_smp_mb__before_uatomic_add()
+#define cmm_smp_mb__after_uatomic_sub()		cmm_smp_mb__after_uatomic_add()
 
 #ifndef uatomic_inc
 #define uatomic_inc(addr)		uatomic_add((addr), 1)
-#define cmm_smp_mb__before_inc()	cmm_smp_mb__before_add()
-#define cmm_smp_mb__after_inc()		cmm_smp_mb__after_add()
+#define cmm_smp_mb__before_uatomic_inc()	cmm_smp_mb__before_uatomic_add()
+#define cmm_smp_mb__after_uatomic_inc()		cmm_smp_mb__after_uatomic_add()
 #endif
 
 #ifndef uatomic_dec
 #define uatomic_dec(addr)		uatomic_add((addr), -1)
-#define cmm_smp_mb__before_dec()	cmm_smp_mb__before_add()
-#define cmm_smp_mb__after_dec()		cmm_smp_mb__after_add()
+#define cmm_smp_mb__before_uatomic_dec()	cmm_smp_mb__before_uatomic_add()
+#define cmm_smp_mb__after_uatomic_dec()		cmm_smp_mb__after_uatomic_add()
 #endif
 
 #ifdef __cplusplus
diff --git a/urcu/uatomic/x86.h b/urcu/uatomic/x86.h
index 99b0e6c..c55ac4e 100644
--- a/urcu/uatomic/x86.h
+++ b/urcu/uatomic/x86.h
@@ -579,28 +579,28 @@ extern unsigned long _compat_uatomic_add_return(void *addr,
 
 #define uatomic_and(addr, v)		\
 		UATOMIC_COMPAT(and(addr, v))
-#define cmm_smp_mb__before_and()	cmm_barrier()
-#define cmm_smp_mb__after_and()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_and()	cmm_barrier()
+#define cmm_smp_mb__after_uatomic_and()		cmm_barrier()
 
 #define uatomic_or(addr, v)		\
 		UATOMIC_COMPAT(or(addr, v))
-#define cmm_smp_mb__before_or()		cmm_barrier()
-#define cmm_smp_mb__after_or()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_or()		cmm_barrier()
+#define cmm_smp_mb__after_uatomic_or()		cmm_barrier()
 
 #define uatomic_add_return(addr, v)		\
 		UATOMIC_COMPAT(add_return(addr, v))
 
 #define uatomic_add(addr, v)	UATOMIC_COMPAT(add(addr, v))
-#define cmm_smp_mb__before_add()	cmm_barrier()
-#define cmm_smp_mb__after_add()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_add()	cmm_barrier()
+#define cmm_smp_mb__after_uatomic_add()		cmm_barrier()
 
 #define uatomic_inc(addr)	UATOMIC_COMPAT(inc(addr))
-#define cmm_smp_mb__before_inc()	cmm_barrier()
-#define cmm_smp_mb__after_inc()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_inc()	cmm_barrier()
+#define cmm_smp_mb__after_uatomic_inc()		cmm_barrier()
 
 #define uatomic_dec(addr)	UATOMIC_COMPAT(dec(addr))
-#define cmm_smp_mb__before_dec()	cmm_barrier()
-#define cmm_smp_mb__after_dec()		cmm_barrier()
+#define cmm_smp_mb__before_uatomic_dec()	cmm_barrier()
+#define cmm_smp_mb__after_uatomic_dec()		cmm_barrier()
 
 #ifdef __cplusplus 
 }