Revert "Fix a race on Limits::ponder"

This reverts commit 5410424e3d036b43715c7989aa99e449cdcde18e.

After the commit pondering is broken, so revert for now. I will
resubmit with a proper fix.

The issue is mine, Joost original code is correct.

No functional change.

diff --git a/src/search.cpp b/src/search.cpp
index 3c638ca057f5e1c3c515498e005cecf88a111c8e..11dcdb34f13840a1b8ff43a7b08df4273fe972f9 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -277,7 +277,7 @@ 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))
+  if (!Threads.stop && (Limits.ponder || Limits.infinite))
   {
       Threads.stopOnPonderhit = true;
       wait(Threads.stop);
@@ -499,7 +499,7 @@ void Thread::search() {
               {
                   // If we are allowed to ponder do not stop the search now but
                   // keep pondering until the GUI sends "ponderhit" or "stop".
-                  if (Threads.ponder)
+                  if (Limits.ponder)
                       Threads.stopOnPonderhit = true;
                   else
                       Threads.stop = true;
@@ -1489,7 +1489,7 @@ moves_loop: // When in check search starts from here
     }
 
     // An engine may not stop pondering until told so by the GUI
-    if (Threads.ponder)
+    if (Limits.ponder)
         return;
 
     if (   (Limits.use_time_management() && elapsed > Time.maximum() - 10)

diff --git a/src/search.h b/src/search.h
index bbdbdfd950e9409483ccdbf0056162f741d7c54c..477570e3919e3d40c7d0092e44a61630a4357e61 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -72,13 +72,14 @@ typedef std::vector<RootMove> RootMoves;
 
 
 /// LimitsType struct stores information sent by GUI about available time to
-/// search the current move, maximum depth/time, or if we are in analysis mode.
+/// search the current move, maximum depth/time, if we are in analysis mode or
+/// if we have to ponder while it's our opponent's turn to move.
 
 struct LimitsType {
 
   LimitsType() { // Init explicitly due to broken value-initialization of non POD in MSVC
     nodes = time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] =
-    npmsec = movestogo = depth = movetime = mate = infinite = 0;
+    npmsec = movestogo = depth = movetime = mate = infinite = ponder = 0;
   }
 
   bool use_time_management() const {
@@ -86,7 +87,7 @@ struct LimitsType {
   }
 
   std::vector<Move> searchmoves;
-  int time[COLOR_NB], inc[COLOR_NB], npmsec, movestogo, depth, movetime, mate, infinite;
+  int time[COLOR_NB], inc[COLOR_NB], npmsec, movestogo, depth, movetime, mate, infinite, ponder;
   int64_t nodes;
   TimePoint startTime;
 };

diff --git a/src/thread.cpp b/src/thread.cpp
index 0b851d6a6e0b5f0f48d5535aea3a06cd5c4d909d..86fce6aa0c20020b6c54666c874a5231793d6c9e 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -187,7 +187,7 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
 
   main()->wait_for_search_finished();
 
-  ponder = stopOnPonderhit = stop = false;
+  stopOnPonderhit = stop = false;
   Search::Limits = limits;
   Search::RootMoves rootMoves;
 

diff --git a/src/thread.h b/src/thread.h
index 3512605c67aaa8120a0cfbea30012ca969894a41..c1b635b7ea4db61dfca33ed0ee3423e3eeefb862 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -101,7 +101,7 @@ struct ThreadPool : public std::vector<Thread*> {
   uint64_t nodes_searched() const;
   uint64_t tb_hits() const;
 
-  std::atomic_bool stop, ponder, stopOnPonderhit;
+  std::atomic_bool stop, stopOnPonderhit;
 
 private:
   StateListPtr setupStates;

diff --git a/src/uci.cpp b/src/uci.cpp
index 758a648cc0eb6f25127cee983a5c65468fe5e882..8f6416bdcb7b866b984e53b5ac6be64c4a7e47b8 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -133,7 +133,7 @@ namespace {
         else if (token == "movetime")  is >> limits.movetime;
         else if (token == "mate")      is >> limits.mate;
         else if (token == "infinite")  limits.infinite = 1;
-        else if (token == "ponder")    Threads.ponder = true;
+        else if (token == "ponder")    limits.ponder = 1;
 
     Threads.start_thinking(pos, States, limits);
   }
@@ -180,7 +180,7 @@ void UCI::loop(int argc, char* argv[]) {
           Threads.main()->start_searching(true); // Could be sleeping
       }
       else if (token == "ponderhit")
-          Threads.ponder = false; // Switch to normal search
+          Search::Limits.ponder = 0; // Switch to normal search
 
       else if (token == "uci")
           sync_cout << "id name " << engine_info(true)