X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=common%2Fos_thread.hpp;h=c01d228910e675f35cc1b56e8d7471c0cd2cdc2f;hb=b032a6f55c364f23206cd619d33bb1cf9867657d;hp=bf4c8eaac5e99dd08bde3ef17670cefdfc605911;hpb=4a3ccab160b3197933b9fdf02d924370b7e48a79;p=apitrace

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index bf4c8ea..c01d228 100644
--- a/common/os_thread.hpp
+++ b/common/os_thread.hpp
@@ -39,6 +39,24 @@
 #include <pthread.h>
 #endif
 
+
+/**
+ * Compiler TLS.
+ *
+ * See also:
+ * - 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"
+#endif
+
+
 namespace os {
 
 
@@ -323,17 +341,34 @@ private:
         typedef pthread_t native_handle_type;
 #endif
 
+        inline
+        thread() :
+            _native_handle(0)
+        {
+        }
+
+        inline
+        thread(thread &other) :
+            _native_handle(other._native_handle)
+        {
+        }
+
         template< class Function, class Arg >
-        explicit thread( Function& f, Arg & arg ) {
+        explicit thread( Function& f, Arg arg ) {
 #ifdef _WIN32
             /* FIXME */
             DWORD id = 0;
             _native_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)f, (LPVOID)arg, 0, &id);
 #else
-            pthread_create(&_native_handle, NULL, f, arg);
+            pthread_create(&_native_handle, NULL, ( void *(*) (void *))f, arg);
 #endif
         }
 
+        inline bool
+        joinable(void) const {
+            return _native_handle != 0;
+        }
+
         inline void
         join() {
 #ifdef _WIN32