X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuci.cpp;h=49a0b22fd6723a89bbbc87174240dc0a125be197;hb=3b14b17664b30933e55d0fb1c8248ddab8b49110;hp=ac58b43c2454495ff42cad4649704159b0a94139;hpb=8991a6f0057ff8e9abf8989426f97753405bb301;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index ac58b43c..49a0b22f 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -17,7 +17,6 @@
along with this program. If not, see .
*/
-#include
#include
#include
#include
@@ -39,6 +38,10 @@ namespace {
// FEN string of the initial position, normal chess
const char* StartFEN = "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). Needed by repetition draw detection.
+ Search::StateStackPtr SetupStates;
+
void set_option(istringstream& up);
void set_position(Position& pos, istringstream& up);
void go(Position& pos, istringstream& up);
@@ -53,14 +56,10 @@ namespace {
void UCI::loop(const string& args) {
Position pos(StartFEN, false, Threads.main_thread()); // The root position
- string cmd, token;
-
- while (token != "quit")
- {
- if (!args.empty())
- cmd = args;
+ string token, 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);
@@ -70,9 +69,8 @@ void UCI::loop(const string& args) {
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
@@ -86,45 +84,7 @@ void UCI::loop(const string& args) {
Threads.main_thread()->wake_up(); // Could be sleeping
}
}
-
- else if (token == "go")
- go(pos, is);
-
- else if (token == "ucinewgame")
- TT.clear();
-
- else if (token == "isready")
- cout << "readyok" << endl;
-
- 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 == "eval")
- cout << Eval::trace(pos) << endl;
-
- else if (token == "bench")
- benchmark(pos, is);
-
- else if (token == "key")
- cout << "key: " << hex << pos.key()
- << "\nmaterial key: " << pos.material_key()
- << "\npawn key: " << pos.pawn_key() << endl;
-
- else if (token == "uci")
- cout << "id name " << engine_info(true)
- << "\n" << Options
- << "\nuciok" << endl;
-
- else if (token == "perft" && (is >> token)) // Read depth
+ else if (token == "perft" && (is >> token)) // Read perft depth
{
stringstream ss;
@@ -133,16 +93,30 @@ 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()
+ << sync_endl;
+
+ else if (token == "uci") sync_cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << sync_endl;
+
+ else if (token == "ucinewgame") TT.clear();
+ 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 == "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
- cout << "Unknown command: " << cmd << endl;
+ 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,10 +129,6 @@ namespace {
void set_position(Position& pos, istringstream& is) {
- // Keep track of position keys along the setup moves (from start position to the
- // position just before to start searching). Needed by repetition draw detection.
- static std::deque st;
-
Move m;
string token, fen;
@@ -175,14 +145,14 @@ namespace {
else
return;
- pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
- st.clear();
+ pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
+ SetupStates = Search::StateStackPtr(new std::stack());
// Parse move list (if any)
while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
{
- st.push_back(StateInfo());
- pos.do_move(m, st.back());
+ SetupStates->push(StateInfo());
+ pos.do_move(m, SetupStates->top());
}
}
@@ -207,12 +177,12 @@ namespace {
if (Options.count(name))
Options[name] = value;
else
- cout << "No such option: " << name << endl;
+ sync_cout << "No such option: " << name << sync_endl;
}
// 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) {
@@ -223,31 +193,23 @@ namespace {
while (is >> token)
{
- if (token == "wtime")
- is >> limits.time[WHITE];
- else if (token == "btime")
- is >> limits.time[BLACK];
- else if (token == "winc")
- is >> limits.inc[WHITE];
- else if (token == "binc")
- is >> limits.inc[BLACK];
- else if (token == "movestogo")
- is >> limits.movestogo;
- else if (token == "depth")
- is >> limits.depth;
- else if (token == "nodes")
- is >> limits.nodes;
- else if (token == "movetime")
- is >> limits.movetime;
- else if (token == "infinite")
- limits.infinite = true;
- else if (token == "ponder")
- limits.ponder = true;
- else if (token == "searchmoves")
+ if (token == "searchmoves")
while (is >> token)
searchMoves.push_back(move_from_uci(pos, token));
+
+ else if (token == "wtime") is >> limits.time[WHITE];
+ else if (token == "btime") is >> limits.time[BLACK];
+ else if (token == "winc") is >> limits.inc[WHITE];
+ else if (token == "binc") is >> limits.inc[BLACK];
+ else if (token == "movestogo") is >> limits.movestogo;
+ 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);
+ Threads.start_searching(pos, limits, searchMoves, SetupStates);
}
}