X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;h=64d12d344a26a1fdca56fd0b1201437241b9967a;hp=ce19c74764de7c82c5c8dbb06e2ddd214027c5f8;hb=bc2433a9853a945a825c244e9ccfe341b73b2ceb;hpb=56b14eae63673af90dd92e9495ee1d6905591f1f

diff --git a/urcu/compiler.h b/urcu/compiler.h
index ce19c74..64d12d3 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -6,7 +6,7 @@
  *
  * Compiler definitions.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
  * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
@@ -23,21 +23,21 @@
 #define likely(x)	__builtin_expect(!!(x), 1)
 #define unlikely(x)	__builtin_expect(!!(x), 0)
 
-#define	barrier()	asm volatile("" : : : "memory")
+#define	cmm_barrier()	asm volatile("" : : : "memory")
 
 /*
  * Instruct the compiler to perform only a single access to a variable
  * (prohibits merging and refetching). The compiler is also forbidden to reorder
- * successive instances of ACCESS_ONCE(), but only when the compiler is aware of
+ * successive instances of CMM_ACCESS_ONCE(), but only when the compiler is aware of
  * particular ordering. Compiler ordering can be ensured, for example, by
- * putting two ACCESS_ONCE() in separate C statements.
+ * putting two CMM_ACCESS_ONCE() in separate C statements.
  *
  * This macro does absolutely -nothing- to prevent the CPU from reordering,
  * merging, or refetching absolutely anything at any time.  Its main intended
  * use is to mediate communication between process-level code and irq/NMI
  * handlers, all running on the same CPU.
  */
-#define ACCESS_ONCE(x)	(*(volatile typeof(x) *)&(x))
+#define CMM_ACCESS_ONCE(x)	(*(volatile typeof(x) *)&(x))
 
 #ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))
@@ -48,11 +48,17 @@
 #endif
 
 #if defined(__SIZEOF_LONG__)
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
+#define CAA_BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
 #elif defined(_LP64)
-#define BITS_PER_LONG	64
+#define CAA_BITS_PER_LONG	64
 #else
-#define BITS_PER_LONG	32
+#define CAA_BITS_PER_LONG	32
 #endif
 
+#define caa_container_of(ptr, type, member)					\
+	({								\
+		const typeof(((type *)NULL)->member) * __ptr = (ptr);	\
+		(type *)((char *)__ptr - offsetof(type, member));	\
+	})
+
 #endif /* _URCU_COMPILER_H */