X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=ad7a8d133f95eb9e897e1da3a6eea2e4d78d8acb;hp=05c7e1d410f3ea6779db2aae98abbcd3a9bbc5ca;hb=81cd7d787ef2b9d914c9c09ddbed59dffb78ec77;hpb=ad1941fd00ddf766b5c2878730fe63ef6a727654

diff --git a/src/uci.cpp b/src/uci.cpp
index 05c7e1d4..ad7a8d13 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -56,41 +56,32 @@ namespace {
 void UCI::loop(const string& args) {
 
   Position pos(StartFEN, false, Threads.main_thread()); // The root position
-  string cmd, token;
+  string token, cmd = args;
 
-  while (token != "quit")
-  {
-      if (!args.empty())
-          cmd = args;
-
-      else if (!getline(cin, cmd)) // Block here waiting for input
+  do {
+      if (args.empty() && !getline(cin, cmd)) // Block here waiting for input
           cmd = "quit";
 
       istringstream is(cmd);
 
       is >> skipws >> token;
 
-      if (token == "quit" || token == "stop")
-      {
-          Search::Signals.stop = true;
-          Threads.wait_for_search_finished(); // Cannot quit while threads are running
-      }
-
-      else if (token == "ponderhit")
+      if (token == "quit" || token == "stop" || token == "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;
-
-          if (Search::Signals.stopOnPonderhit)
+          // GUI sends 'ponderhit' to tell us to ponder on the same move the
+          // opponent has played. In case Signals.stopOnPonderhit is set we are
+          // waiting for 'ponderhit' to stop the search (for instance because we
+          // already ran out of time), otherwise we should continue searching but
+          // switching from pondering to normal search.
+          if (token != "ponderhit" || Search::Signals.stopOnPonderhit)
           {
               Search::Signals.stop = true;
-              Threads.main_thread()->wake_up(); // Could be sleeping
+              Threads.main_thread()->notify_one(); // Could be sleeping
           }
+          else
+              Search::Limits.ponder = false;
       }
-
-      else if (token == "perft" && (is >> token)) // Read requested depth
+      else if (token == "perft" && (is >> token)) // Read perft depth
       {
           stringstream ss;
 
@@ -99,7 +90,6 @@ void UCI::loop(const string& args) {
 
           benchmark(pos, ss);
       }
-
       else if (token == "key") sync_cout <<   "position key: " << hex << pos.key()
                                          << "\nmaterial key: " << pos.material_key()
                                          << "\npawn key:     " << pos.pawn_key()
@@ -113,20 +103,17 @@ void UCI::loop(const string& args) {
       else if (token == "go")         go(pos, is);
       else if (token == "position")   set_position(pos, is);
       else if (token == "setoption")  set_option(is);
-      else if (token == "d")          pos.print();
       else if (token == "flip")       pos.flip();
       else if (token == "bench")      benchmark(pos, is);
+      else if (token == "d")          sync_cout << pos.pretty() << sync_endl;
       else if (token == "isready")    sync_cout << "readyok" << sync_endl;
       else if (token == "eval")       sync_cout << Eval::trace(pos) << sync_endl;
       else
           sync_cout << "Unknown command: " << cmd << sync_endl;
 
-      if (!args.empty()) // Command line arguments have one-shot behaviour
-      {
-          Threads.wait_for_search_finished();
-          break;
-      }
-  }
+  } while (token != "quit" && args.empty()); // Args have one-shot behaviour
+
+  Threads.wait_for_search_finished(); // Cannot quit while search is running
 }
 
 
@@ -155,7 +142,7 @@ namespace {
     else
         return;
 
-    pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
+    pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
     SetupStates = Search::StateStackPtr(new std::stack<StateInfo>());
 
     // Parse move list (if any)
@@ -192,7 +179,7 @@ namespace {
 
 
   // go() is called when engine receives the "go" UCI command. The function sets
-  // the thinking time and other parameters from the input string, and then starts
+  // the thinking time and other parameters from the input string, and starts
   // the search.
 
   void go(Position& pos, istringstream& is) {
@@ -215,6 +202,7 @@ namespace {
         else if (token == "depth")     is >> limits.depth;
         else if (token == "nodes")     is >> limits.nodes;
         else if (token == "movetime")  is >> limits.movetime;
+        else if (token == "mate")      is >> limits.mate;
         else if (token == "infinite")  limits.infinite = true;
         else if (token == "ponder")    limits.ponder = true;
     }