Cleanup thread_win.h

[stockfish] / src / thread.h

diff --git a/src/thread.h b/src/thread.h
index a639cf7ea051e143782fc206212256aa8b2e248a..0469dc1d70fa180cfe17ca6a38e1c7a733b1ba28 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -32,6 +32,7 @@
 #include "pawns.h"
 #include "position.h"
 #include "search.h"
+#include "thread_win32.h"
 
 struct Thread;
 
@@ -39,34 +40,18 @@ const size_t MAX_THREADS = 128;
 const size_t MAX_SPLITPOINTS_PER_THREAD = 8;
 const size_t MAX_SLAVES_PER_SPLITPOINT = 4;
 
-#if !defined(NO_SPINLOCK)
-/// Spinlock class wraps low level atomic operations to provide a spin lock
-
-class Spinlock {
-
-  std::atomic_int lock;
 
-public:
-  Spinlock() { lock = 1; } // Init here to workaround a bug with MSVC 2013
-  void acquire() {
-    while (lock.fetch_sub(1, std::memory_order_acquire) != 1)
-        while (lock.load(std::memory_order_relaxed) <= 0) {}
-  }
-  void release() { lock.store(1, std::memory_order_release); }
-};
-
-#else
+/// Spinlock class wraps low level atomic operations to provide a spin lock
 
 class Spinlock {
 
-  std::mutex mutex;
+  Mutex m; // WARNING: Diasabled spinlocks to test on fishtest
 
 public:
-  void acquire() { mutex.lock(); }
-  void release() { mutex.unlock(); }
+  void acquire() { m.lock(); }
+  void release() { m.unlock(); }
 };
 
-#endif
 
 /// SplitPoint struct stores information shared by the threads searching in
 /// parallel below the same split point. It is populated at splitting time.
@@ -110,8 +95,8 @@ struct ThreadBase {
   void wait_for(volatile const bool& b);
 
   std::thread nativeThread;
-  std::mutex mutex;
-  std::condition_variable sleepCondition;
+  Mutex mutex;
+  ConditionVariable sleepCondition;
   volatile bool exit = false;
 };
 
@@ -179,7 +164,7 @@ struct ThreadPool : public std::vector<Thread*> {
 
   Depth minimumSplitDepth;
   Spinlock spinlock;
-  std::condition_variable sleepCondition;
+  ConditionVariable sleepCondition;
   TimerThread* timer;
 };