Fix a race in pondering mode

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index d7c65e10e066810811def3763f3685c24ca10492..72e3d0bd0cd4600f5c1694c884ff769b1a1d6a66 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -28,6 +28,7 @@
 #include "move.h"
 #include "position.h"
 #include "search.h"
+#include "thread.h"
 #include "ucioption.h"
 
 using namespace std;
@@ -44,7 +45,7 @@ namespace {
 
   void set_option(istringstream& up);
   void set_position(Position& pos, istringstream& up);
-  bool go(Position& pos, istringstream& up);
+  void go(Position& pos, istringstream& up);
   void perft(Position& pos, istringstream& up);
 }
 
@@ -58,20 +59,38 @@ void uci_loop() {
 
   Position pos(StarFEN, false, 0); // The root position
   string cmd, token;
+  bool quit = false;
 
-  while (getline(cin, cmd))
+  while (!quit && getline(cin, cmd))
   {
       istringstream is(cmd);
 
       is >> skipws >> token;
 
-      if (token == "quit")
-          break;
+      if (cmd == "quit" || cmd == "stop")
+      {
+          quit = (token == "quit");
+          Search::Signals.stop = true;
+          Threads[0].wake_up(); // In case is waiting for stop or ponderhit
+      }
+
+      else if (cmd == "ponderhit")
+      {
+          // The opponent has played the expected move. GUI sends "ponderhit" if
+          // we were told to ponder on the same move the opponent has played. We
+          // should continue searching but switching from pondering to normal search.
+          Search::Limits.ponder = false; // FIXME racing
 
-      if (token == "go" && !go(pos, is))
-          break;
+          if (Search::Signals.stopOnPonderhit)
+              Search::Signals.stop = true;
 
-      if (token == "ucinewgame")
+          Threads[0].wake_up(); // In case is waiting for stop or ponderhit
+      }
+
+      else if (token == "go")
+          go(pos, is);
+
+      else if (token == "ucinewgame")
           pos.from_fen(StarFEN, false);
 
       else if (token == "isready")
@@ -90,7 +109,7 @@ void uci_loop() {
           pos.print();
 
       else if (token == "flip")
-          pos.flip();
+          pos.flip_me();
 
       else if (token == "eval")
       {
@@ -183,19 +202,21 @@ namespace {
   // string, and then calls think(). Returns false if a quit command
   // is received while thinking, true otherwise.
 
-  bool go(Position& pos, istringstream& is) {
+  void go(Position& pos, istringstream& is) {
 
     string token;
-    SearchLimits limits;
-    std::vector<Move> searchMoves;
     int time[] = { 0, 0 }, inc[] = { 0, 0 };
 
+    memset(&Search::Limits, 0, sizeof(Search::Limits));
+    Search::RootMoves.clear();
+    Search::RootPosition = &pos;
+
     while (is >> token)
     {
         if (token == "infinite")
-            limits.infinite = true;
+            Search::Limits.infinite = true;
         else if (token == "ponder")
-            limits.ponder = true;
+            Search::Limits.ponder = true;
         else if (token == "wtime")
             is >> time[WHITE];
         else if (token == "btime")
@@ -205,23 +226,23 @@ namespace {
         else if (token == "binc")
             is >> inc[BLACK];
         else if (token == "movestogo")
-            is >> limits.movesToGo;
+            is >> Search::Limits.movesToGo;
         else if (token == "depth")
-            is >> limits.maxDepth;
+            is >> Search::Limits.maxDepth;
         else if (token == "nodes")
-            is >> limits.maxNodes;
+            is >> Search::Limits.maxNodes;
         else if (token == "movetime")
-            is >> limits.maxTime;
+            is >> Search::Limits.maxTime;
         else if (token == "searchmoves")
             while (is >> token)
-                searchMoves.push_back(move_from_uci(pos, token));
+                Search::RootMoves.push_back(move_from_uci(pos, token));
     }
 
-    searchMoves.push_back(MOVE_NONE);
-    limits.time = time[pos.side_to_move()];
-    limits.increment = inc[pos.side_to_move()];
+    Search::RootMoves.push_back(MOVE_NONE);
+    Search::Limits.time = time[pos.side_to_move()];
+    Search::Limits.increment = inc[pos.side_to_move()];
 
-    return think(pos, limits, &searchMoves[0]);
+    Threads.start_thinking();
   }
 
 
@@ -239,7 +260,7 @@ namespace {
 
     time = get_system_time();
 
-    n = perft(pos, depth * ONE_PLY);
+    n = Search::perft(pos, depth * ONE_PLY);
 
     time = get_system_time() - time;