Include <cstring> in search.h

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index 86fe629a84f69708fd6057c9897790fbdc816063..306819bb3e46f680544f4a0b0fea69a9f6921782 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);
 }
 
@@ -66,11 +67,28 @@ void uci_loop() {
 
       is >> skipws >> token;
 
-      if (token == "quit")
-          quit = true;
+      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 (Search::Signals.stopOnPonderhit)
+              Search::Signals.stop = true;
+
+          Threads[0].wake_up(); // In case is waiting for stop or ponderhit
+      }
 
       else if (token == "go")
-          quit = !go(pos, is);
+          go(pos, is);
 
       else if (token == "ucinewgame")
           pos.from_fen(StarFEN, false);
@@ -184,10 +202,10 @@ 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;
+    Search::LimitsType limits;
     std::vector<Move> searchMoves;
     int time[] = { 0, 0 }, inc[] = { 0, 0 };
 
@@ -217,12 +235,11 @@ namespace {
             while (is >> token)
                 searchMoves.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()];
 
-    return think(pos, limits, &searchMoves[0]);
+    Threads.start_thinking(pos, limits, searchMoves, true);
   }
 
 
@@ -240,7 +257,7 @@ namespace {
 
     time = get_system_time();
 
-    n = perft(pos, depth * ONE_PLY);
+    n = Search::perft(pos, depth * ONE_PLY);
 
     time = get_system_time() - time;