os: Fallback to OS TLS when compiler does not support it (issue #120).

[apitrace] / common / os_thread.hpp

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index 9dc656eedce84798480de480b3fa1747e1da7c9b..fb340e162c2401e4bc019326b9f44d413acab544 100644 (file)
--- a/common/os_thread.hpp
+++ b/common/os_thread.hpp
@@ -40,6 +40,10 @@
 #endif
 
 
+/*
+ * These features are not supported on Windows XP
+ */
+#define USE_WIN32_DECLSPEC_THREAD 0
 #define USE_WIN32_CONDITION_VARIABLES 0
 
 
@@ -50,13 +54,15 @@
  * - http://gcc.gnu.org/onlinedocs/gcc-4.6.3/gcc/Thread_002dLocal.html
  * - http://msdn.microsoft.com/en-us/library/9w1sdazb.aspx
  */
-#if defined(_MSC_VER)
-#  define thread_specific __declspec(thread)
-#elif defined(__GNUC__)
-#  define thread_specific __thread
-#else
-#  define thread_specific
-#  error "Unsupported compiler"
+#if !defined(_WIN32) || USE_WIN32_DECLSPEC_THREAD
+#  if defined(_MSC_VER)
+#    define OS_THREAD_SPECIFIC_PTR(_type) __declspec(thread) _type *
+#  elif defined(__GNUC__)
+#    define OS_THREAD_SPECIFIC_PTR(_type) __thread _type *
+#  endif
+#endif
+#if !defined(OS_THREAD_SPECIFIC_PTR)
+#  define OS_THREAD_SPECIFIC_PTR(_type) os::thread_specific_ptr< _type >
 #endif
 
 
@@ -283,6 +289,74 @@ namespace os {
     };
 
 
+    template <typename T>
+    class thread_specific_ptr
+    {
+    private:
+#ifdef _WIN32
+        DWORD dwTlsIndex;
+#else
+        pthread_key_t key;
+#endif
+
+    public:
+        thread_specific_ptr(void) {
+#ifdef _WIN32
+            dwTlsIndex = TlsAlloc();
+#else
+            pthread_key_create(&key, NULL);
+#endif
+        }
+
+        ~thread_specific_ptr() {
+#ifdef _WIN32
+            TlsFree(dwTlsIndex);
+#else
+            pthread_key_delete(key);
+#endif
+        }
+
+        inline T *
+        get(void) const {
+            void *ptr;
+#ifdef _WIN32
+            ptr = TlsGetValue(dwTlsIndex);
+#else
+            ptr = pthread_getspecific(key);
+#endif
+            return static_cast<T*>(ptr);
+        }
+
+        inline
+        operator T * (void) const
+        {
+            return get();
+        }
+
+        inline T *
+        operator -> (void) const
+        {
+            return get();
+        }
+
+        inline T *
+        operator = (T * new_value)
+        {
+            set(new_value);
+            return new_value;
+        }
+
+        inline void
+        set(T* new_value) {
+#ifdef _WIN32
+            TlsSetValue(dwTlsIndex, new_value);
+#else
+            pthread_setspecific(key, new_value);
+#endif
+        }
+    };
+
+
     /**
      * Same interface as std::thread
      */
@@ -312,7 +386,7 @@ namespace os {
             DWORD id = 0;
             _native_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)f, (LPVOID)arg, 0, &id);
 #else
-            pthread_create(&_native_handle, NULL, ( void *(*) (void *))f, arg);
+            pthread_create(&_native_handle, NULL, (void *(*) (void *))f, (void *)arg);
 #endif
         }