Implement missing threading primitive for Windows.

[apitrace] / common / os_thread.hpp

diff --git a/common/os_thread.hpp b/common/os_thread.hpp
index e5eb19d3604c8dd61c47e5ccd22c4b57f1f72e28..72195b6c2aecbae33517904b75845fc9e1cdc10d 100644 (file)
--- 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
@@ -187,14 +187,14 @@ namespace os {
     {
     public:
 #ifdef _WIN32
-        /* FIXME */
+        typedef CONDITION_VARIABLE native_handle_type;
 #else
         typedef pthread_cond_t native_handle_type;
 #endif
 
         condition_variable() {
 #ifdef _WIN32
-            /* FIXME */
+            InitializeConditionVariable(&_native_handle);
 #else
             pthread_cond_init(&_native_handle, NULL);
 #endif
@@ -202,7 +202,7 @@ namespace os {
 
         ~condition_variable() {
 #ifdef _WIN32
-            /* FIXME */
+            /* No-op */
 #else
             pthread_cond_destroy(&_native_handle);
 #endif
@@ -211,7 +211,7 @@ namespace os {
         inline void
         signal(void) {
 #ifdef _WIN32
-            /* FIXME */
+            WakeConditionVariable(&_native_handle);
 #else
             pthread_cond_signal(&_native_handle);
 #endif
@@ -219,10 +219,12 @@ namespace os {
 
         inline void
         wait(unique_lock<mutex> & lock) {
+            mutex::native_handle_type & mutex_native_handle = lock.mutex()->native_handle();
 #ifdef _WIN32
             /* FIXME */
+            SleepConditionVariableCS(&_native_handle, &mutex_native_handle, INFINITE);
 #else
-            pthread_cond_wait(&_native_handle, &lock.mutex()->native_handle());
+            pthread_cond_wait(&_native_handle, &mutex_native_handle);
 #endif
         }
 
@@ -299,6 +301,51 @@ namespace os {
     };
 
 
+    /**
+     * Same interface as std::thread
+     */
+    class thread {
+    public:
+#ifdef _WIN32
+        typedef HANDLE native_handle_type;
+#else
+        typedef pthread_t native_handle_type;
+#endif
+
+        template< class Function, class 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);
+#endif
+        }
+
+        inline void
+        join() {
+#ifdef _WIN32
+            WaitForSingleObject(_native_handle, INFINITE);
+#else
+            pthread_join(_native_handle, NULL);
+#endif
+        }
+
+    private:
+        native_handle_type _native_handle;
+
+#if 0
+#ifdef _WIN32
+        template< class Function, class Arg >
+        static DWORD WINAPI
+        ThreadProc(LPVOID lpParameter) {
+
+        );
+#endif
+#endif
+    };
+
 } /* namespace os */
 
 #endif /* _OS_THREAD_HPP_ */