Don't wait for the search to finish after a 'stop'
command, but keep processing the GUI input if any.
Also explicitly wake up the main thread (that could be
sleeping) after a 'stop' or 'quit' command and do not
rely on wait_for_search_finished() doing it for us.
This patch cleans up the code and functions's definitions,
but it is risky and needs a good test under different
conditions to be sure it does not introduces hungs up.
No functional change.
Thread* t = main_thread();
t->mutex.lock();
Thread* t = main_thread();
t->mutex.lock();
- t->sleepCondition.notify_one(); // In case is waiting for stop or ponderhit
while (!t->do_sleep) sleepCondition.wait(t->mutex);
t->mutex.unlock();
}
while (!t->do_sleep) sleepCondition.wait(t->mutex);
t->mutex.unlock();
}
void UCI::loop(const string& args) {
Position pos(StartFEN, false, Threads.main_thread()); // The root position
void UCI::loop(const string& args) {
Position pos(StartFEN, false, Threads.main_thread()); // The root position
+ 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);
cmd = "quit";
istringstream is(cmd);
if (token == "quit" || token == "stop")
{
Search::Signals.stop = true;
if (token == "quit" || token == "stop")
{
Search::Signals.stop = true;
- Threads.wait_for_search_finished(); // Cannot quit while threads are running
+ Threads.main_thread()->wake_up(); // Could be sleeping
else if (token == "ponderhit")
{
// The opponent has played the expected move. GUI sends "ponderhit" if
else if (token == "ponderhit")
{
// The opponent has played the expected move. GUI sends "ponderhit" if
Threads.main_thread()->wake_up(); // Could be sleeping
}
}
Threads.main_thread()->wake_up(); // Could be sleeping
}
}
-
- else if (token == "perft" && (is >> token)) // Read requested depth
+ else if (token == "perft" && (is >> token)) // Read perft depth
else if (token == "key") sync_cout << "position key: " << hex << pos.key()
<< "\nmaterial key: " << pos.material_key()
<< "\npawn key: " << pos.pawn_key()
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;
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
// go() is called when engine receives the "go" UCI command. The function sets
// 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) {
// the search.
void go(Position& pos, istringstream& is) {