Changeset 371 for cpp/common

Timestamp:

04/21/15 15:19:47 (10 years ago)

Author:

Maciej Komosinski

Message:

THREAD_LOCAL uses ThreadLocal_ prefix for variables. The static object inside the single-threaded implementation is no longer associated with a class.

File:

• cpp/common/threads.h (modified) (5 diffs)

cpp/common/threads.h

@@ -92 +92 @@
 #else //ifdef MULTITHREADED
 
-template<class T> class ThreadSingleton
-{
-T object;
+#define tlsGet(var) (&ThreadLocal_ ## var ## _getref())
+#define tlsGetRef(var) ThreadLocal_ ## var ## _getref()
+#define tlsSet(var,o) var.set(o)
 
-  public:
-
-T* get() {return &object;}
-T& getref() {return object;}
-};
+#define THREAD_LOCAL_DECL(cls,var) cls& ThreadLocal_ ## var ## _getref()
+#define THREAD_LOCAL_DEF(cls,var) cls& ThreadLocal_ ## var ## _getref() \
+        { \
+        static cls object; \
+        return object; \
+        }
 
 template<class T> class ThreadSingletonPtr
 {
 T *object;
-
   public:
-
 ThreadSingletonPtr():object(NULL) {}
 T* get() {return object;}
@@ -119 +118 @@
 // THREAD_LOCAL(cls) - behaves like object of class cls (automatic creation/destruction)
 // THREAD_LOCAL(cls)..._PTR - behaves like pointer to cls (initial NULL, no autocreation/destruction)
+// var is a (global) name, can't be a class member anymore because it might be implemented as function
 // _PTR can only be accessed using tls...Ptr() variant of Get/Set, _ptr suffix is internally used in variable name to avoid mistakes
 #ifdef USE_CPP_TLS
@@ -124 +124 @@
 // use c++ implementation (CPP_TLS must also be defined)
 
-#define THREAD_LOCAL_DECL(cls,var) CPP_TLS cls* var
-#define THREAD_LOCAL_DEF(cls,var) CPP_TLS cls* var=NULL
-#define THREAD_LOCAL_DECL_PTR(cls,var) CPP_TLS cls* var ## _ptr
-#define THREAD_LOCAL_DEF_PTR(cls,var) CPP_TLS cls* var ## _ptr=NULL
+#define THREAD_LOCAL_DECL(cls,var) CPP_TLS cls* ThreadLocal_ ## var
+#define THREAD_LOCAL_DEF(cls,var) CPP_TLS cls* ThreadLocal_ ## var=NULL
+#define THREAD_LOCAL_DECL_PTR(cls,var) CPP_TLS cls* ThreadLocal_ ## var ## _ptr
+#define THREAD_LOCAL_DEF_PTR(cls,var) CPP_TLS cls* ThreadLocal_ ## var ## _ptr=NULL
 
-template<class T> T* tlsGet(T*& var)
+template<class T> T* _tlsGet(T*& var)
 {
 if (!var)
@@ -136 +136 @@
 }
 
-template<class T> T* tlsGetPtr(T*& var)
+template<class T> T* _tlsGetPtr(T*& var)
 {
 return var;
 }
 
-#define tlsGetRef(var) (*tlsGet(var))
+#define tlsGet(var) _tlsGet(ThreadLocal_ ## var)
+#define tlsGetRef(var) (*_tlsGet(ThreadLocal_ ## var))
 
-template<class T> T* tlsSet(T*& var,T* new_o)
+template<class T> T* _tlsSet(T*& var,T* new_o)
 {
 T* o=var;
@@ -150 +151 @@
 }
 
-#define tlsGetSetPtr(var,o) tlsSet(var ## _ptr,o)
+#define tlsGetPtr(var) _tlsGetPtr(ThreadLocal_ ## var)
+#define tlsSetPtr(var,o) _tlsSet(ThreadLocal_ ## var ## _ptr,o)
 
-#else
+#else //#ifdef USE_CPP_TLS
 
 // use pthreads implementation
 
-#define THREAD_LOCAL_DECL(cls,var) ThreadSingleton<cls> var
-#define THREAD_LOCAL_DEF(cls,var) ThreadSingleton<cls> var
-#define tlsGet(var) var.get()
-#define tlsGetRef(var) var.getref()
-#define tlsSet(var,o) var.set(o)
+#ifdef MULTITHREADED
+#define THREAD_LOCAL_DECL(cls,var) ThreadSingleton<cls> ThreadLocal_ ## var
+#define THREAD_LOCAL_DEF(cls,var) ThreadSingleton<cls> ThreadLocal_ ## var
+#define tlsGet(var) ThreadLocal_ ## var.get()
+#define tlsGetRef(var) ThreadLocal_ ## var.getref()
+#define tlsSet(var,o) ThreadLocal_ ## var.set(o)
+#endif
 
-#define THREAD_LOCAL_DECL_PTR(cls,var) ThreadSingletonPtr<cls> var ## _ptr
-#define THREAD_LOCAL_DEF_PTR(cls,var) ThreadSingletonPtr<cls> var ## _ptr
-#define tlsGetPtr(var) var ## _ptr.get()
-#define tlsSetPtr(var,o) var ## _ptr.setptr(o)
+#define THREAD_LOCAL_DECL_PTR(cls,var) extern ThreadSingletonPtr<cls> ThreadLocal_ ## var ## _ptr
+#define THREAD_LOCAL_DEF_PTR(cls,var) ThreadSingletonPtr<cls> ThreadLocal_ ## var ## _ptr
+#define tlsGetPtr(var) ThreadLocal_ ## var ## _ptr.get()
+#define tlsSetPtr(var,o) ThreadLocal_ ## var ## _ptr.setptr(o)
 
-#endif
+#endif //#ifdef USE_CPP_TLS