Retire Threads wake_up() and sleep()

[stockfish] / src / thread.cpp

diff --git a/src/thread.cpp b/src/thread.cpp
index b599960528a00d2e67c0948d9a93146a04e14023..712b04a30fa85a625fbc6c4cf80e6b90cd359ce7 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -67,7 +67,7 @@ Thread::~Thread() {
   assert(do_sleep);
 
   do_exit = true; // Search must be already finished
-  wake_up();
+  notify_one();
   thread_join(handle); // Wait for thread termination
 }
 
@@ -120,10 +120,10 @@ void Thread::main_loop() {
 }
 
 
-// Thread::wake_up() wakes up the thread, normally at the beginning of the search
-// or, if "sleeping threads" is used at split time.
+// Thread::notify_one() wakes up the thread, normally at the beginning of the
+// search or, if "sleeping threads" is used at split time.
 
-void Thread::wake_up() {
+void Thread::notify_one() {
 
   mutex.lock();
   sleepCondition.notify_one();
@@ -131,19 +131,12 @@ void Thread::wake_up() {
 }
 
 
-// Thread::wait_for_stop_or_ponderhit() is called when the maximum depth is
-// reached while the program is pondering. The point is to work around a wrinkle
-// in the UCI protocol: When pondering, the engine is not allowed to give a
-// "bestmove" before the GUI sends it a "stop" or "ponderhit" command. We simply
-// wait here until one of these commands (that raise StopRequest) is sent and
-// then return, after which the bestmove and pondermove will be printed.
+// Thread::wait_for() set the thread to sleep until condition 'b' turns true
 
-void Thread::wait_for_stop_or_ponderhit() {
-
-  Signals.stopOnPonderhit = true;
+void Thread::wait_for(volatile const bool& b) {
 
   mutex.lock();
-  while (!Signals.stop) sleepCondition.wait(mutex);
+  while (!b) sleepCondition.wait(mutex);
   mutex.unlock();
 }
 
@@ -232,34 +225,6 @@ void ThreadPool::read_uci_options() {
 }
 
 
-// wake_up() is called before a new search to start the threads that are waiting
-// on the sleep condition and to reset maxPly. When useSleepingThreads is set
-// threads will be woken up at split time.
-
-void ThreadPool::wake_up() const {
-
-  for (size_t i = 0; i < threads.size(); i++)
-  {
-      threads[i]->maxPly = 0;
-      threads[i]->do_sleep = false;
-
-      if (!useSleepingThreads)
-          threads[i]->wake_up();
-  }
-}
-
-
-// sleep() is called after the search finishes to ask all the threads but the
-// main one to go waiting on a sleep condition.
-
-void ThreadPool::sleep() const {
-
-  // Main thread will go to sleep by itself to avoid a race with start_searching()
-  for (size_t i = 1; i < threads.size(); i++)
-      threads[i]->do_sleep = true;
-}
-
-
 // available_slave_exists() tries to find an idle thread which is available as
 // a slave for the thread 'master'.
 
@@ -273,6 +238,16 @@ bool ThreadPool::available_slave_exists(Thread* master) const {
 }
 
 
+// set_timer() is used to set the timer to trigger after msec milliseconds.
+// If msec is 0 then timer is stopped.
+
+void ThreadPool::set_timer(int msec) {
+
+  timer->maxPly = msec;
+  timer->notify_one(); // Wake up and restart the timer
+}
+
+
 // split() does the actual work of distributing the work at a node between
 // several available threads. If it does not succeed in splitting the node
 // (because no idle threads are available, or because we have no unused split
@@ -338,7 +313,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
           threads[i]->is_searching = true; // Slave leaves idle_loop()
 
           if (useSleepingThreads)
-              threads[i]->wake_up();
+              threads[i]->notify_one();
 
           if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
               break;
@@ -385,18 +360,6 @@ template Value ThreadPool::split<false>(Position&, Stack*, Value, Value, Value,
 template Value ThreadPool::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
 
 
-// set_timer() is used to set the timer to trigger after msec milliseconds.
-// If msec is 0 then timer is stopped.
-
-void ThreadPool::set_timer(int msec) {
-
-  timer->mutex.lock();
-  timer->maxPly = msec;
-  timer->sleepCondition.notify_one(); // Wake up and restart the timer
-  timer->mutex.unlock();
-}
-
-
 // wait_for_search_finished() waits for main thread to go to sleep, this means
 // search is finished. Then returns.
 
@@ -431,5 +394,5 @@ void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
           RootMoves.push_back(RootMove(ml.move()));
 
   main_thread()->do_sleep = false;
-  main_thread()->wake_up();
+  main_thread()->notify_one();
 }