Use acquire() and release() for spinlocks

[stockfish] / src / thread.cpp

diff --git a/src/thread.cpp b/src/thread.cpp
index 007ed46e10c54bb85e12955f835b3ba6c8d79ede..4b5d845bd83577992601f1306a881bdacb812d19 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -144,7 +144,7 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
   // Pick and init the next available split point
   SplitPoint& sp = splitPoints[splitPointsSize];
 
-  sp.mutex.lock(); // No contention here until we don't increment splitPointsSize
+  sp.spinlock.acquire(); // No contention here until we don't increment splitPointsSize
 
   sp.master = this;
   sp.parentSplitPoint = activeSplitPoint;
@@ -174,7 +174,7 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
   while (    sp.slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
          && (slave = Threads.available_slave(&sp)) != nullptr)
   {
-     slave->allocMutex.lock();
+     slave->spinlock.acquire();
 
       if (slave->can_join(activeSplitPoint))
       {
@@ -183,16 +183,14 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
           slave->searching = true;
       }
 
-      slave->allocMutex.unlock();
-
-      slave->notify_one(); // Could be sleeping
+      slave->spinlock.release();
   }
 
   // Everything is set up. The master thread enters the idle loop, from which
   // it will instantly launch a search, because its 'searching' flag is set.
   // The thread will return from the idle loop when all slaves have finished
   // their work at this split point.
-  sp.mutex.unlock();
+  sp.spinlock.release();
 
   Thread::idle_loop(); // Force a call to base class idle_loop()
 
@@ -207,7 +205,7 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
   // We have returned from the idle loop, which means that all threads are
   // finished. Note that decreasing splitPointsSize must be done under lock
   // protection to avoid a race with Thread::can_join().
-  sp.mutex.lock();
+  sp.spinlock.acquire();
 
   --splitPointsSize;
   activeSplitPoint = sp.parentSplitPoint;
@@ -216,7 +214,7 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
   *bestMove = sp.bestMove;
   *bestValue = sp.bestValue;
 
-  sp.mutex.unlock();
+  sp.spinlock.release();
 }
 
 
@@ -375,5 +373,7 @@ void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
           RootMoves.push_back(RootMove(m));
 
   main()->thinking = true;
-  main()->notify_one(); // Starts main thread
+
+  for (Thread* th : *this)
+      th->notify_one();
 }