Move ponder to MainThread

vondele · vondele · commit beedc8bbffc1 · 2019-01-13T08:43:07.000+01:00
the variable is only used to exchange signals between the UCI thread and mainThread.

No functional change
diff --git a/src/search.cpp b/src/search.cpp
@@ -229,7 +229,7 @@ void MainThread::search() {
   // GUI sends a "stop" or "ponderhit" command. We therefore simply wait here
   // until the GUI sends one of those commands.
 
-  while (!Threads.stop && (Threads.ponder || Limits.infinite))
+  while (!Threads.stop && (ponder || Limits.infinite))
   {} // Busy wait for a stop or a ponder reset
 
   // Stop the threads if not already stopped (also raise the stop if
@@ -517,7 +517,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 (mainThread->ponder)
                   mainThread->stopOnPonderhit = true;
               else
                   Threads.stop = true;
@@ -1587,7 +1587,7 @@ void MainThread::check_time() {
   }
 
   // We should not stop pondering until told so by the GUI
-  if (Threads.ponder)
+  if (ponder)
       return;
 
   if (   (Limits.use_time_management() && (elapsed > Time.maximum() - 10 || stopOnPonderhit))
diff --git a/src/thread.cpp b/src/thread.cpp
@@ -163,7 +163,7 @@ void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
   main()->wait_for_search_finished();
 
   main()->stopOnPonderhit = stop = false;
-  ponder = ponderMode;
+  main()->ponder = ponderMode;
   Search::Limits = limits;
   Search::RootMoves rootMoves;
 
diff --git a/src/thread.h b/src/thread.h
@@ -89,6 +89,7 @@ struct MainThread : public Thread {
   Value previousScore;
   int callsCnt;
   bool stopOnPonderhit;
+  std::atomic_bool ponder;
 };
 
 
@@ -106,7 +107,7 @@ struct ThreadPool : public std::vector<Thread*> {
   uint64_t nodes_searched() const { return accumulate(&Thread::nodes); }
   uint64_t tb_hits()        const { return accumulate(&Thread::tbHits); }
 
-  std::atomic_bool stop, ponder;
+  std::atomic_bool stop;
 
 private:
   StateListPtr setupStates;
diff --git a/src/uci.cpp b/src/uci.cpp
@@ -216,7 +216,7 @@ void UCI::loop(int argc, char* argv[]) {
       // user has played. We should continue searching but switch from pondering to
       // normal search.
       else if (token == "ponderhit")
-          Threads.ponder = false; // Switch to normal search
+          Threads.main()->ponder = false; // Switch to normal search
 
       else if (token == "uci")
           sync_cout << "id name " << engine_info(true)
