X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=72e3d0bd0cd4600f5c1694c884ff769b1a1d6a66;hp=8f8dd7be7f8f082f17a706f734e4df885f44fe3f;hb=ffa75215cc06d105bc2b43ddb8ed5d4deccd8988;hpb=5b0c6b9bc0687c2f3618fb588b5dc3617f6e2a29 diff --git a/src/uci.cpp b/src/uci.cpp index 8f8dd7be..72e3d0bd 100644 --- 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; @@ -35,7 +36,7 @@ using namespace std; namespace { // FEN string for the initial position - const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; + const char* StarFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; // Keep track of position keys along the setup moves (from start position to the // position just before to start searching). This is needed by draw detection @@ -44,71 +45,91 @@ 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); } -/// execute_uci_command() takes a string as input, parses this text string as -/// an UCI command, and calls the appropriate functions. In addition to the -/// UCI commands, the function also supports a few debug commands. +/// Wait for a command from the user, parse this text string as an UCI command, +/// and calls the appropriate functions. Also intercepts EOF from stdin to +/// ensure that we exit gracefully if the GUI dies unexpectedly. In addition to +/// the UCI commands, the function also supports a few debug commands. -bool execute_uci_command(const string& cmd) { +void uci_loop() { - static Position pos(StartPositionFEN, false, 0); // The root position + Position pos(StarFEN, false, 0); // The root position + string cmd, token; + bool quit = false; - istringstream is(cmd); - string token; + while (!quit && getline(cin, cmd)) + { + istringstream is(cmd); - is >> skipws >> token; + is >> skipws >> token; - if (token == "quit") - return false; + if (cmd == "quit" || cmd == "stop") + { + quit = (token == "quit"); + Search::Signals.stop = true; + Threads[0].wake_up(); // In case is waiting for stop or ponderhit + } - if (token == "go") - return go(pos, is); + 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 (token == "ucinewgame") - pos.from_fen(StartPositionFEN, false); + if (Search::Signals.stopOnPonderhit) + Search::Signals.stop = true; - else if (token == "isready") - cout << "readyok" << endl; + Threads[0].wake_up(); // In case is waiting for stop or ponderhit + } - else if (token == "position") - set_position(pos, is); + else if (token == "go") + go(pos, is); - else if (token == "setoption") - set_option(is); + else if (token == "ucinewgame") + pos.from_fen(StarFEN, false); - else if (token == "perft") - perft(pos, is); + else if (token == "isready") + cout << "readyok" << endl; - else if (token == "d") - pos.print(); + else if (token == "position") + set_position(pos, is); - else if (token == "flip") - pos.flip(); + else if (token == "setoption") + set_option(is); - else if (token == "eval") - { - read_evaluation_uci_options(pos.side_to_move()); - cout << trace_evaluate(pos) << endl; - } + else if (token == "perft") + perft(pos, is); + + else if (token == "d") + pos.print(); - else if (token == "key") - cout << "key: " << hex << pos.get_key() - << "\nmaterial key: " << pos.get_material_key() - << "\npawn key: " << pos.get_pawn_key() << endl; + else if (token == "flip") + pos.flip_me(); - else if (token == "uci") - cout << "id name " << engine_name() - << "\nid author " << engine_authors() - << "\n" << Options.print_all() - << "\nuciok" << endl; - else - cout << "Unknown command: " << cmd << endl; + else if (token == "eval") + { + read_evaluation_uci_options(pos.side_to_move()); + cout << trace_evaluate(pos) << endl; + } - return true; + else if (token == "key") + cout << "key: " << hex << pos.get_key() + << "\nmaterial key: " << pos.get_material_key() + << "\npawn key: " << pos.get_pawn_key() << endl; + + else if (token == "uci") + cout << "id name " << engine_name() + << "\nid author " << engine_authors() + << "\n" << Options.print_all() + << "\nuciok" << endl; + else + cout << "Unknown command: " << cmd << endl; + } } @@ -128,7 +149,7 @@ namespace { if (token == "startpos") { - fen = StartPositionFEN; + fen = StarFEN; is >> token; // Consume "moves" token if any } else if (token == "fen") @@ -181,19 +202,21 @@ 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; - std::vector searchMoves; int time[] = { 0, 0 }, inc[] = { 0, 0 }; + memset(&Search::Limits, 0, sizeof(Search::Limits)); + Search::RootMoves.clear(); + Search::RootPosition = &pos; + while (is >> token) { if (token == "infinite") - limits.infinite = true; + Search::Limits.infinite = true; else if (token == "ponder") - limits.ponder = true; + Search::Limits.ponder = true; else if (token == "wtime") is >> time[WHITE]; else if (token == "btime") @@ -203,23 +226,23 @@ namespace { else if (token == "binc") is >> inc[BLACK]; else if (token == "movestogo") - is >> limits.movesToGo; + is >> Search::Limits.movesToGo; else if (token == "depth") - is >> limits.maxDepth; + is >> Search::Limits.maxDepth; else if (token == "nodes") - is >> limits.maxNodes; + is >> Search::Limits.maxNodes; else if (token == "movetime") - is >> limits.maxTime; + is >> Search::Limits.maxTime; else if (token == "searchmoves") while (is >> token) - searchMoves.push_back(move_from_uci(pos, token)); + Search::RootMoves.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()]; + Search::RootMoves.push_back(MOVE_NONE); + Search::Limits.time = time[pos.side_to_move()]; + Search::Limits.increment = inc[pos.side_to_move()]; - return think(pos, limits, &searchMoves[0]); + Threads.start_thinking(); } @@ -237,7 +260,7 @@ namespace { time = get_system_time(); - n = perft(pos, depth * ONE_PLY); + n = Search::perft(pos, depth * ONE_PLY); time = get_system_time() - time;