X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;h=19534f08522ac3cc28a3557d93f7a16baab6e56e;hp=64d12d344a26a1fdca56fd0b1201437241b9967a;hb=4b5f005b03669c2942969e691fc3a0be47b15c57;hpb=9d2614f07691a813a3c560a6c0bcd0a7be854ed5

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 64d12d3..19534f0 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -8,22 +8,23 @@
  *
  * 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.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #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")
+#define	cmm_barrier()	__asm__ __volatile__ ("" : : : "memory")
 
 /*
  * Instruct the compiler to perform only a single access to a variable
@@ -37,14 +38,14 @@
  * use is to mediate communication between process-level code and irq/NMI
  * handlers, all running on the same CPU.
  */
-#define CMM_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))
+#ifndef caa_max
+#define caa_max(a,b) ((a)>(b)?(a):(b))
 #endif
 
-#ifndef min
-#define min(a,b) ((a)<(b)?(a):(b))
+#ifndef caa_min
+#define caa_min(a,b) ((a)<(b)?(a):(b))
 #endif
 
 #if defined(__SIZEOF_LONG__)
@@ -55,10 +56,56 @@
 #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)CAA_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
+
+#define caa_is_signed_type(type)	((type) -1 < (type) 0)
+
+/*
+ * Sign-extend to long if needed, and output type is unsigned long.
+ */
+#define caa_cast_long_keep_sign(v)		\
+	(caa_is_signed_type(__typeof__(v)) ?	\
+		(unsigned long) (long) (v) :	\
+		(unsigned long) (v))
+
+#if defined (__GNUC__) \
+	&& ((__GNUC_MAJOR__ == 4) && (__GNUC_MINOR__ >= 5)	\
+		|| __GNUC_MAJOR__ >= 5)
+#define CDS_DEPRECATED(msg)	\
+	__attribute__((deprecated(msg)))
+#else
+#define CDS_DEPRECATED(msg)	\
+	__attribute__((deprecated))
+#endif
+
+#define CAA_ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
+
 #endif /* _URCU_COMPILER_H */