image: Add floating point support.

[apitrace] / common / os_thread.hpp

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index 5ec7f5dd00aa3d6a484532076a453c04f41c4c8f..f3ae210053da2b08ef711f516a92a3be433860b1 100644 (file)
--- a/common/os_thread.hpp
+++ b/common/os_thread.hpp
@@ -26,7 +26,7 @@
 /*
  * OS native thread abstraction.
  *
- * Mimics C++11 / boost threads.
+ * Mimics C++11 threads.
  */
 
 #ifndef _OS_THREAD_HPP_
@@ -40,6 +40,9 @@
 #endif
 
 
+/*
+ * This feature is not supported on Windows XP
+ */
 #define USE_WIN32_CONDITION_VARIABLES 0
 
 
@@ -50,13 +53,10 @@
  * - 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
+#if defined(HAVE_COMPILER_TLS)
+#  define OS_THREAD_SPECIFIC_PTR(_type) HAVE_COMPILER_TLS _type *
 #else
-#  define thread_specific
-#  error "Unsupported compiler"
+#  define OS_THREAD_SPECIFIC_PTR(_type) os::thread_specific_ptr< _type >
 #endif
 
 
@@ -283,9 +283,6 @@ namespace os {
     };
 
 
-    /**
-     * Same interface as boost::thread_specific_ptr.
-     */
     template <typename T>
     class thread_specific_ptr
     {
@@ -294,10 +291,6 @@ namespace os {
         DWORD dwTlsIndex;
 #else
         pthread_key_t key;
-
-        static void destructor(void *ptr) {
-            delete static_cast<T *>(ptr);
-        }
 #endif
 
     public:
@@ -305,7 +298,7 @@ namespace os {
 #ifdef _WIN32
             dwTlsIndex = TlsAlloc();
 #else
-            pthread_key_create(&key, &destructor);
+            pthread_key_create(&key, NULL);
 #endif
         }
 
@@ -317,7 +310,8 @@ namespace os {
 #endif
         }
 
-        T* get(void) const {
+        inline T *
+        get(void) const {
             void *ptr;
 #ifdef _WIN32
             ptr = TlsGetValue(dwTlsIndex);
@@ -327,32 +321,27 @@ namespace os {
             return static_cast<T*>(ptr);
         }
 
-        T* operator -> (void) const
+        inline
+        operator T * (void) const
         {
             return get();
         }
 
-        T& operator * (void) const
+        inline T *
+        operator -> (void) const
         {
-            return *get();
+            return get();
         }
 
-        void reset(T* new_value=0) {
-            T * old_value = get();
+        inline T *
+        operator = (T * new_value)
+        {
             set(new_value);
-            if (old_value) {
-                delete old_value;
-            }
-        }
-
-        T* release (void) {
-            T * old_value = get();
-            set(0);
-            return old_value;
+            return new_value;
         }
 
-private:
-        void set(T* new_value) {
+        inline void
+        set(T* new_value) {
 #ifdef _WIN32
             TlsSetValue(dwTlsIndex, new_value);
 #else
@@ -385,6 +374,10 @@ private:
         {
         }
 
+        inline
+        ~thread() {
+        }
+
         template< class Function, class Arg >
         explicit thread( Function& f, Arg arg ) {
 #ifdef _WIN32
@@ -395,6 +388,12 @@ private:
 #endif
         }
 
+        inline thread &
+        operator =(const thread &other) {
+            _native_handle = other._native_handle;
+            return *this;
+        }
+
         inline bool
         joinable(void) const {
             return _native_handle != 0;