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;
benchmark(pos, ss);
}
-
else if (token == "key") sync_cout << "position key: " << hex << pos.key()
<< "\nmaterial key: " << pos.material_key()
<< "\npawn key: " << pos.pawn_key()
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_think_finished(); // Cannot quit while search is running
}
// 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) {
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;
}
- Threads.start_searching(pos, limits, searchMoves, SetupStates);
+ Threads.start_thinking(pos, limits, searchMoves, SetupStates);
}
}