X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;h=f977b95fdc60f73b6ef6c9ab2b96c4c30a884de2;hp=54904cc4078ed144f8a25bc4778cea1ef7fd1319;hb=cc6b0c208a9707f8a64609a51167290caeace288;hpb=bc727dc3413af8a5a53167df248a51c6ee2f5cb7

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 54904cc..f977b95 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -20,8 +20,8 @@
 
 #include <stddef.h>	/* for offsetof */
 
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
+#define caa_likely(x)	__builtin_expect(!!(x), 1)
+#define caa_unlikely(x)	__builtin_expect(!!(x), 0)
 
 #define	cmm_barrier()	asm volatile("" : : : "memory")
 
@@ -55,10 +55,34 @@
 #define CAA_BITS_PER_LONG	32
 #endif
 
-#define caa_container_of(ptr, type, member)					\
+/*
+ * caa_container_of - Get the address of an object containing a field.
+ *
+ * @ptr: pointer to the field.
+ * @type: type of the object.
+ * @member: name of the field within the object.
+ */
+#define caa_container_of(ptr, type, member)				\
 	({								\
-		const typeof(((type *)NULL)->member) * __ptr = (ptr);	\
+		const typeof(((type *) NULL)->member) * __ptr = (ptr);	\
 		(type *)((char *)__ptr - offsetof(type, member));	\
 	})
 
+#define CAA_BUILD_BUG_ON_ZERO(cond) (sizeof(struct { int:-!!(cond); }))
+#define CAA_BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond))
+
+/*
+ * __rcu is an annotation that documents RCU pointer accesses that need
+ * to be protected by a read-side critical section. Eventually, a static
+ * checker will be able to use this annotation to detect incorrect RCU
+ * usage.
+ */
+#define __rcu
+
+#ifdef __cplusplus
+#define URCU_FORCE_CAST(type, arg)	(reinterpret_cast<type>(arg))
+#else
+#define URCU_FORCE_CAST(type, arg)	((type) (arg))
+#endif
+
 #endif /* _URCU_COMPILER_H */