Cleaned up trace profiler output.

[apitrace] / common / os_thread.hpp

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index 727ad6a484ff0c94a1e8d76bd4a88a3dd846dc15..fe7faaa004ae98fc318a07da9ea3aa174ee9fbec 100644 (file)
--- a/common/os_thread.hpp
+++ b/common/os_thread.hpp
@@ -32,6 +32,7 @@
 #ifndef _OS_THREAD_HPP_
 #define _OS_THREAD_HPP_
 
+
 #ifdef _WIN32
 #include <windows.h>
 #else
@@ -41,38 +42,121 @@
 namespace os {
 
 
-    namespace thread {
+    class recursive_mutex
+    {
+    public:
+#ifdef _WIN32
+        typedef CRITICAL_SECTION native_handle_type;
+#else
+        typedef pthread_mutex_t native_handle_type;
+#endif
 
-        /**
-         * Thread ID
-         *
-         * XXX: Actually C++11 thread::id is not an integral type, but we rely on that.
-         */
+        recursive_mutex(void) {
 #ifdef _WIN32
-        typedef DWORD id;
+            InitializeCriticalSection(&_native_handle);
 #else
-        typedef pthread_t id;
+            pthread_mutexattr_t attr;
+            pthread_mutexattr_init(&attr);
+            pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+            pthread_mutex_init(&_native_handle, &attr);
+            pthread_mutexattr_destroy(&attr);
 #endif
+        }
+
+        ~recursive_mutex() {
+#ifdef _WIN32
+            DeleteCriticalSection(&_native_handle);
+#else
+            pthread_mutex_destroy(&_native_handle);
+#endif
+        }
+
+        inline void
+        lock(void) {
+#ifdef _WIN32
+            EnterCriticalSection(&_native_handle);
+#else
+            pthread_mutex_lock(&_native_handle);
+#endif
+        }
+
+        inline void
+        unlock(void) {
+#ifdef _WIN32
+            LeaveCriticalSection(&_native_handle);
+#else
+            pthread_mutex_unlock(&_native_handle);
+#endif
+        }
+
+    private:
+        native_handle_type _native_handle;
+    };
 
-    } /* namespace thread */
 
+    template <typename T>
+    class thread_specific_ptr
+    {
+    private:
+#ifdef _WIN32
+        DWORD dwTlsIndex;
+#else
+        pthread_key_t key;
 
-    namespace this_thread {
+        static void destructor(void *ptr) {
+            delete static_cast<T *>(ptr);
+        }
+#endif
 
-        /**
-         * Get current thread ID.
-         */
-        inline thread::id
-        get_id(void) {
+    public:
+        thread_specific_ptr(void) {
 #ifdef _WIN32
-            return GetCurrentThreadId();
+            dwTlsIndex = TlsAlloc();
 #else
-            return pthread_self();
+            pthread_key_create(&key, &destructor);
 #endif
         }
 
-    } /* namespace this_thread */
+        ~thread_specific_ptr() {
+#ifdef _WIN32
+            TlsFree(dwTlsIndex);
+#else
+            pthread_key_delete(key);
+#endif
+        }
 
+        T* get(void) const {
+            void *ptr;
+#ifdef _WIN32
+            ptr = TlsGetValue(dwTlsIndex);
+#else
+            ptr = pthread_getspecific(key);
+#endif
+            return static_cast<T*>(ptr);
+        }
+
+        T* operator -> (void) const
+        {
+            return get();
+        }
+
+        T& operator * (void) const
+        {
+            return *get();
+        }
+
+        void reset(T* new_value=0) {
+            T * old_value = get();
+#ifdef _WIN32
+            TlsSetValue(dwTlsIndex, new_value);
+#else
+            pthread_setspecific(key, new_value);
+#endif
+            if (old_value) {
+                delete old_value;
+            }
+        }
+    };
 
 } /* namespace os */