Simplify finished search in ponder/infinite mode.

In this rare case (e.g. go infinite on a stalemate),
just spin till ponderhit/stop comes.

The Thread::wait() is a renmant of the old YBWC
code, today with lazy SMP, threads don't need to
wait when outside of their idle loop.

No functional change.

diff --git a/src/search.cpp b/src/search.cpp
index 3c638ca057f5e1c3c515498e005cecf88a111c8e..68069c23c5afc610c0c949c58a3b29315575a676 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -277,13 +277,13 @@ void MainThread::search() {
   // the UCI protocol states that we shouldn't print the best move before the
   // GUI sends a "stop" or "ponderhit" command. We therefore simply wait here
   // until the GUI sends one of those commands (which also raises Threads.stop).
-  if (!Threads.stop && (Threads.ponder || Limits.infinite))
-  {
-      Threads.stopOnPonderhit = true;
-      wait(Threads.stop);
-  }
+  Threads.stopOnPonderhit = true;
+
+  while (!Threads.stop && (Threads.ponder || Limits.infinite))
+  {} // Busy wait for a stop or a ponder reset
 
-  // Stop the threads if not already stopped
+  // Stop the threads if not already stopped (also raise the stop if
+  // "ponderhit" just reset Threads.ponder).
   Threads.stop = true;
 
   // Wait until all threads have finished

diff --git a/src/thread.cpp b/src/thread.cpp
index 6d3364d5c56525c1bdad9fc8af803ce8ed2234e2..c602e0b46a873a60ae6a02d117d8d70347206829 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -68,24 +68,12 @@ void Thread::wait_for_search_finished() {
 }
 
 
-/// Thread::wait() waits on sleep condition until condition is true
-
-void Thread::wait(std::atomic_bool& condition) {
-
-  std::unique_lock<Mutex> lk(mutex);
-  sleepCondition.wait(lk, [&]{ return bool(condition); });
-}
-
-
 /// Thread::start_searching() wakes up the thread that will start the search
 
-void Thread::start_searching(bool resume) {
+void Thread::start_searching() {
 
   std::unique_lock<Mutex> lk(mutex);
-
-  if (!resume)
-      searching = true;
-
+  searching = true;
   sleepCondition.notify_one();
 }
 

diff --git a/src/thread.h b/src/thread.h
index ee43bfb5ba19f7afb7b43f50f45c6377d7574f55..9b2e359b972b5e3fab9f2babe84f589c9e3ead7a 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -52,9 +52,8 @@ public:
   virtual ~Thread();
   virtual void search();
   void idle_loop();
-  void start_searching(bool resume = false);
+  void start_searching();
   void wait_for_search_finished();
-  void wait(std::atomic_bool& condition);
 
   Pawns::Table pawnsTable;
   Material::Table materialTable;

diff --git a/src/uci.cpp b/src/uci.cpp
index 58b38779ee2bec226c5cd29002ef345ba3a221c0..a56a54031d07722673f4e95368a01b22a8b64175 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -176,10 +176,8 @@ void UCI::loop(int argc, char* argv[]) {
       if (    token == "quit"
           ||  token == "stop"
           || (token == "ponderhit" && Threads.stopOnPonderhit))
-      {
           Threads.stop = true;
-          Threads.main()->start_searching(true); // Could be sleeping
-      }
+
       else if (token == "ponderhit")
           Threads.ponder = false; // Switch to normal search