X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=common%2Fos_thread.hpp;h=5e9577b56a29924b816abfc10fb16baf70a9bb14;hb=a7e7b27a13dc40db4ec96bc1bba667644ef0a896;hp=e5eb19d3604c8dd61c47e5ccd22c4b57f1f72e28;hpb=e86f5a2f9b1e57ee2535a285f6385878c78cf0ea;p=apitrace

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index e5eb19d..5e9577b 100644
--- a/common/os_thread.hpp
+++ b/common/os_thread.hpp
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- * Copyright 2011 Jose Fonseca
+ * Copyright 2011-2012 Jose Fonseca
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,9 +24,9 @@
  **************************************************************************/
 
 /*
- * Simple OS abstraction.
+ * OS native thread abstraction.
  *
- * Mimics C++11 / boost threads.
+ * Mimics C++11 threads.
  */
 
 #ifndef _OS_THREAD_HPP_
@@ -39,6 +39,27 @@
 #include <pthread.h>
 #endif
 
+
+#define USE_WIN32_CONDITION_VARIABLES 0
+
+
+/**
+ * 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 {
 
 
@@ -185,16 +206,31 @@ namespace os {
      */
     class condition_variable
     {
-    public:
+    private:
 #ifdef _WIN32
-        /* FIXME */
+#  if USE_WIN32_CONDITION_VARIABLES
+        // XXX: Only supported on Vista an higher. Not yet supported by WINE.
+        typedef CONDITION_VARIABLE native_handle_type;
+        native_handle_type _native_handle;
+#else
+        // http://www.cs.wustl.edu/~schmidt/win32-cv-1.html
+        LONG cWaiters;
+        HANDLE hEvent;
+#endif
 #else
         typedef pthread_cond_t native_handle_type;
+        native_handle_type _native_handle;
 #endif
 
+    public:
         condition_variable() {
 #ifdef _WIN32
-            /* FIXME */
+#  if USE_WIN32_CONDITION_VARIABLES
+            InitializeConditionVariable(&_native_handle);
+#  else
+            cWaiters = 0;
+            hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+#  endif
 #else
             pthread_cond_init(&_native_handle, NULL);
 #endif
@@ -202,7 +238,11 @@ namespace os {
 
         ~condition_variable() {
 #ifdef _WIN32
-            /* FIXME */
+#  if USE_WIN32_CONDITION_VARIABLES
+            /* No-op */
+#  else
+            CloseHandle(hEvent);
+#  endif
 #else
             pthread_cond_destroy(&_native_handle);
 #endif
@@ -211,7 +251,13 @@ namespace os {
         inline void
         signal(void) {
 #ifdef _WIN32
-            /* FIXME */
+#  if USE_WIN32_CONDITION_VARIABLES
+            WakeConditionVariable(&_native_handle);
+#  else
+            if (cWaiters) {
+                SetEvent(hEvent);
+            }
+#  endif
 #else
             pthread_cond_signal(&_native_handle);
 #endif
@@ -219,86 +265,85 @@ namespace os {
 
         inline void
         wait(unique_lock<mutex> & lock) {
+            mutex::native_handle_type & mutex_native_handle = lock.mutex()->native_handle();
 #ifdef _WIN32
-            /* FIXME */
+#  if USE_WIN32_CONDITION_VARIABLES
+            SleepConditionVariableCS(&_native_handle, &mutex_native_handle, INFINITE);
+#  else
+            InterlockedIncrement(&cWaiters);
+            LeaveCriticalSection(&mutex_native_handle);
+            WaitForSingleObject(hEvent, INFINITE);
+            EnterCriticalSection(&mutex_native_handle);
+            InterlockedDecrement(&cWaiters);
+#  endif
 #else
-            pthread_cond_wait(&_native_handle, &lock.mutex()->native_handle());
+            pthread_cond_wait(&_native_handle, &mutex_native_handle);
 #endif
         }
-
-    protected:
-        native_handle_type _native_handle;
     };
 
 
     /**
-     * Same interface as boost::thread_specific_ptr.
+     * Same interface as std::thread
      */
-    template <typename T>
-    class thread_specific_ptr
-    {
-    private:
+    class thread {
+    public:
 #ifdef _WIN32
-        DWORD dwTlsIndex;
+        typedef HANDLE native_handle_type;
 #else
-        pthread_key_t key;
+        typedef pthread_t native_handle_type;
+#endif
 
-        static void destructor(void *ptr) {
-            delete static_cast<T *>(ptr);
+        inline
+        thread() :
+            _native_handle(0)
+        {
         }
-#endif
 
-    public:
-        thread_specific_ptr(void) {
-#ifdef _WIN32
-            dwTlsIndex = TlsAlloc();
-#else
-            pthread_key_create(&key, &destructor);
-#endif
+        inline
+        thread(thread &other) :
+            _native_handle(other._native_handle)
+        {
         }
 
-        ~thread_specific_ptr() {
+        template< class Function, class Arg >
+        explicit thread( Function& f, Arg arg ) {
 #ifdef _WIN32
-            TlsFree(dwTlsIndex);
+            DWORD id = 0;
+            _native_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)f, (LPVOID)arg, 0, &id);
 #else
-            pthread_key_delete(key);
+            pthread_create(&_native_handle, NULL, ( void *(*) (void *))f, arg);
 #endif
         }
 
-        T* get(void) const {
-            void *ptr;
+        inline bool
+        joinable(void) const {
+            return _native_handle != 0;
+        }
+
+        inline void
+        join() {
 #ifdef _WIN32
-            ptr = TlsGetValue(dwTlsIndex);
+            WaitForSingleObject(_native_handle, INFINITE);
 #else
-            ptr = pthread_getspecific(key);
+            pthread_join(_native_handle, NULL);
 #endif
-            return static_cast<T*>(ptr);
-        }
-
-        T* operator -> (void) const
-        {
-            return get();
         }
 
-        T& operator * (void) const
-        {
-            return *get();
-        }
+    private:
+        native_handle_type _native_handle;
 
-        void reset(T* new_value=0) {
-            T * old_value = get();
+#if 0
 #ifdef _WIN32
-            TlsSetValue(dwTlsIndex, new_value);
-#else
-            pthread_setspecific(key, new_value);
+        template< class Function, class Arg >
+        static DWORD WINAPI
+        ThreadProc(LPVOID lpParameter) {
+
+        );
+#endif
 #endif
-            if (old_value) {
-                delete old_value;
-            }
-        }
     };
 
-
 } /* namespace os */
 
 #endif /* _OS_THREAD_HPP_ */