X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=8f930149f333e764d3525fc9d93fd8f4dba3798b;hb=e5da0e4b79b405da5bdc42f6fb4c2ba49afba00a;hp=b6809f4e37221dcca2329b62980f07a7e42c5238;hpb=be509525336b65419e708678abe4e16efb5f6f4d;p=stockfish

diff --git a/src/thread.h b/src/thread.h
index b6809f4e..8f930149 100644
--- 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,20 +40,17 @@ const size_t MAX_THREADS = 128;
 const size_t MAX_SPLITPOINTS_PER_THREAD = 8;
 const size_t MAX_SLAVES_PER_SPLITPOINT = 4;
 
-
-/// Spinlock class wraps low level atomic operations to provide a spin lock
-
 class Spinlock {
-
-  std::atomic_int lock;
+  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) {}
+  Spinlock() { _lock = 1; } // Init here to workaround a bug with MSVC 2013
+  void lock() {
+      while (_lock.fetch_sub(1, std::memory_order_acquire) != 1)
+          for (int cnt = 0; _lock.load(std::memory_order_relaxed) <= 0; ++cnt)
+              if (cnt >= 10000) std::this_thread::yield(); // Be nice to hyperthreading
   }
-  void release() { lock.store(1, std::memory_order_release); }
+  void unlock() { _lock.store(1, std::memory_order_release); }
 };
 
 
@@ -75,7 +73,7 @@ struct SplitPoint {
   SplitPoint* parentSplitPoint;
 
   // Shared variable data
-  Spinlock spinlock;
+  Spinlock mutex;
   std::bitset<MAX_THREADS> slavesMask;
   volatile bool allSlavesSearching;
   volatile uint64_t nodes;
@@ -98,8 +96,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;
 };
 
@@ -129,6 +127,7 @@ struct Thread : public ThreadBase {
   SplitPoint* volatile activeSplitPoint;
   volatile size_t splitPointsSize;
   volatile bool searching;
+  Spinlock allocMutex;
 };
 
 
@@ -166,8 +165,7 @@ struct ThreadPool : public std::vector<Thread*> {
   void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
 
   Depth minimumSplitDepth;
-  Spinlock spinlock;
-  std::condition_variable sleepCondition;
+  ConditionVariable sleepCondition;
   TimerThread* timer;
 };