Use compiler TLS for thread_id tracking.

[apitrace] / common / os_thread.hpp

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index bf4c8eaac5e99dd08bde3ef17670cefdfc605911..6c0b488c0152474a031a82839b0c767777714fdd 100644 (file)
--- 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 {
 
 
@@ -324,7 +342,7 @@ private:
 #endif
 
         template< class Function, class Arg >
-        explicit thread( Function& f, Arg & arg ) {
+        explicit thread( Function& f, Arg arg ) {
 #ifdef _WIN32
             /* FIXME */
             DWORD id = 0;