kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

Async 'stop' command

Browse source 
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.
This commit is contained in:
Marco Costalba 2013-01-06 12:49:01 +01:00
parent edce2a8448
commit e1191b35e8
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/thread.cpp
View file

@ -404,7 +404,6 @@ void ThreadPool::wait_for_search_finished() {
Thread* t = main_thread(); Thread* t = main_thread();
t->mutex.lock(); t->mutex.lock();
t->sleepCondition.notify_one(); // In case is waiting for stop or ponderhit
while (!t->do_sleep) sleepCondition.wait(t->mutex); while (!t->do_sleep) sleepCondition.wait(t->mutex);
t->mutex.unlock(); t->mutex.unlock();
} }

28
src/uci.cpp
View file

@ -56,14 +56,10 @@ namespace {
void UCI::loop(const string& args) { void UCI::loop(const string& args) {
Position pos(StartFEN, false, Threads.main_thread()); // The root position Position pos(StartFEN, false, Threads.main_thread()); // The root position
string cmd, token; string token, cmd = args;
while (token != "quit") do {
{ if (args.empty() && !getline(cin, cmd)) // Block here waiting for input
if (!args.empty())
cmd = args;
else if (!getline(cin, cmd)) // Block here waiting for input
cmd = "quit"; cmd = "quit";
istringstream is(cmd); istringstream is(cmd);
@ -73,9 +69,8 @@ void UCI::loop(const string& args) {
if (token == "quit" || token == "stop") if (token == "quit" || token == "stop")
{ {
Search::Signals.stop = true; 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") else if (token == "ponderhit")
{ {
// The opponent has played the expected move. GUI sends "ponderhit" if // The opponent has played the expected move. GUI sends "ponderhit" if
@ -89,8 +84,7 @@ void UCI::loop(const string& args) {
Threads.main_thread()->wake_up(); // Could be sleeping Threads.main_thread()->wake_up(); // Could be sleeping
} }
} }
else if (token == "perft" && (is >> token)) // Read perft depth
else if (token == "perft" && (is >> token)) // Read requested depth
{ {
stringstream ss; stringstream ss;
@ -99,7 +93,6 @@ void UCI::loop(const string& args) {
benchmark(pos, ss); benchmark(pos, ss);
} }
else if (token == "key") sync_cout << "position key: " << hex << pos.key() else if (token == "key") sync_cout << "position key: " << hex << pos.key()
<< "\nmaterial key: " << pos.material_key() << "\nmaterial key: " << pos.material_key()
<< "\npawn key: " << pos.pawn_key() << "\npawn key: " << pos.pawn_key()
@ -121,12 +114,9 @@ void UCI::loop(const string& args) {
else else
sync_cout << "Unknown command: " << cmd << sync_endl; sync_cout << "Unknown command: " << cmd << sync_endl;
if (!args.empty()) // Command line arguments have one-shot behaviour } while (token != "quit" && args.empty()); // Args have one-shot behaviour
{
Threads.wait_for_search_finished(); Threads.wait_for_search_finished(); // Cannot quit while search is running
break;
}
}
} }
@ -192,7 +182,7 @@ namespace {
// 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. // the search.
void go(Position& pos, istringstream& is) { void go(Position& pos, istringstream& is) {