X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=urcu%2Ftls-compat.h;h=325b01b234c4b5f590742e830a1c3715ad9661e3;hb=9cce461a8bdfeec66d813018fcbeb40b9ce4b729;hp=601336b0db6599312bf4277a668f129c8e7c1645;hpb=9948a988350a1f6564a724f79cdeb2a294ee82aa;p=userspace-rcu.git

diff --git a/urcu/tls-compat.h b/urcu/tls-compat.h
index 601336b..325b01b 100644
--- a/urcu/tls-compat.h
+++ b/urcu/tls-compat.h
@@ -32,7 +32,17 @@
 extern "C" {
 #endif
 
-#ifdef CONFIG_RCU_TLS	/* Based on ax_tls.m4 */
+#ifdef CONFIG_RCU_TLS
+
+#if defined (__cplusplus) && (__cplusplus >= 201103L)
+# define URCU_TLS_STORAGE_CLASS	thread_local
+#elif defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)
+# define URCU_TLS_STORAGE_CLASS	_Thread_local
+#elif defined (_MSC_VER)
+# define URCU_TLS_STORAGE_CLASS	__declspec(thread)
+#else
+# define URCU_TLS_STORAGE_CLASS	__thread
+#endif
 
 /*
  * Hint: How to define/declare TLS variables of compound types
@@ -44,7 +54,7 @@ extern "C" {
  * 	typedef int my_int_array_type[4];
  * 	DEFINE_URCU_TLS(my_int_array_type, var_name);
  *
- * Another exmaple:
+ * Another example:
  * 	typedef void (*call_rcu_flavor)(struct rcu_head *, XXXX);
  * 	DECLARE_URCU_TLS(call_rcu_flavor, p_call_rcu);
  *
@@ -65,15 +75,19 @@ extern "C" {
  */
 
 # define DECLARE_URCU_TLS(type, name)	\
-	CONFIG_RCU_TLS type name
+	URCU_TLS_STORAGE_CLASS type name
 
 # define DEFINE_URCU_TLS(type, name)	\
-	CONFIG_RCU_TLS type name
+	URCU_TLS_STORAGE_CLASS type name
 
 # define URCU_TLS(name)		(name)
 
 #else /* #ifndef CONFIG_RCU_TLS */
 
+/*
+ * The *_1() macros ensure macro parameters are expanded.
+ */
+
 # include <pthread.h>
 
 struct urcu_tls {
@@ -82,14 +96,16 @@ struct urcu_tls {
 	int init_done;
 };
 
-# define DECLARE_URCU_TLS(type, name)				\
+# define DECLARE_URCU_TLS_1(type, name)				\
 	type *__tls_access_ ## name(void)
+# define DECLARE_URCU_TLS(type, name)				\
+	DECLARE_URCU_TLS_1(type, name)
 
 /*
  * Note: we don't free memory at process exit, since it will be dealt
  * with by the OS.
  */
-# define DEFINE_URCU_TLS(type, name)				\
+# define DEFINE_URCU_TLS_1(type, name)				\
 	type *__tls_access_ ## name(void)			\
 	{							\
 		static struct urcu_tls __tls_ ## name = {	\
@@ -118,7 +134,12 @@ struct urcu_tls {
 		return __tls_p;					\
 	}
 
-# define URCU_TLS(name)		(*__tls_access_ ## name())
+# define DEFINE_URCU_TLS(type, name)				\
+	DEFINE_URCU_TLS_1(type, name)
+
+# define URCU_TLS_1(name)	(*__tls_access_ ## name())
+
+# define URCU_TLS(name)		URCU_TLS_1(name)
 
 #endif	/* #else #ifndef CONFIG_RCU_TLS */