X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.h;h=8f930149f333e764d3525fc9d93fd8f4dba3798b;hb=d71f7070406bc018e3ca868461d77a90eaebfcbc;hp=0469dc1d70fa180cfe17ca6a38e1c7a733b1ba28;hpb=04372316b3739e4e99ab1bcfd6923fef9de3110f;p=stockfish

diff --git a/src/thread.h b/src/thread.h
index 0469dc1d..8f930149 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -40,16 +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 {
-
-  Mutex m; // WARNING: Diasabled spinlocks to test on fishtest
+  std::atomic_int _lock;
 
 public:
-  void acquire() { m.lock(); }
-  void release() { m.unlock(); }
+  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 unlock() { _lock.store(1, std::memory_order_release); }
 };
 
 
@@ -72,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;
@@ -126,6 +127,7 @@ struct Thread : public ThreadBase {
   SplitPoint* volatile activeSplitPoint;
   volatile size_t splitPointsSize;
   volatile bool searching;
+  Spinlock allocMutex;
 };
 
 
@@ -163,7 +165,6 @@ struct ThreadPool : public std::vector<Thread*> {
   void start_thinking(const Position&, const Search::LimitsType&, Search::StateStackPtr&);
 
   Depth minimumSplitDepth;
-  Spinlock spinlock;
   ConditionVariable sleepCondition;
   TimerThread* timer;
 };