X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=395b78a813bf4e9342a14ba44f7ef78e3ba9f6aa;hp=31d0a721ab38f2038bccce775c1413bb1621f68e;hb=15616ad19965444ea66896a0511f2a4d48745110;hpb=3df2c01b5769c7ae996fb5b992c06e4a5428ad35
diff --git a/src/uci.cpp b/src/uci.cpp
index 31d0a721..395b78a8 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -42,9 +43,9 @@ namespace {
// 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);
+ void setoption(istringstream& up);
+ void position(Position& pos, istringstream& up);
+ void go(const Position& pos, istringstream& up);
}
@@ -55,79 +56,33 @@ namespace {
void UCI::loop(const string& args) {
- Position pos(StartFEN, false, Threads.main_thread()); // The root position
- string cmd, token;
+ Position pos(StartFEN, false, Threads.main()); // 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);
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()->notify_one(); // Could be sleeping
}
+ else
+ Search::Limits.ponder = false;
}
-
- 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;
@@ -136,27 +91,48 @@ void UCI::loop(const string& args) {
benchmark(pos, ss);
}
+ else if (token == "key")
+ sync_cout << hex << uppercase << setfill('0')
+ << "position key: " << setw(16) << pos.key()
+ << "\nmaterial key: " << setw(16) << pos.material_key()
+ << "\npawn key: " << setw(16) << pos.pawn_key()
+ << dec << sync_endl;
- else
- cout << "Unknown command: " << cmd << endl;
+ else if (token == "uci")
+ sync_cout << "id name " << engine_info(true)
+ << "\n" << Options
+ << "\nuciok" << sync_endl;
- if (!args.empty()) // Command line arguments have one-shot behaviour
+ else if (token == "eval")
{
- Threads.wait_for_search_finished();
- break;
+ Search::RootColor = pos.side_to_move(); // Ensure it is set
+ sync_cout << Eval::trace(pos) << sync_endl;
}
- }
+ else if (token == "ucinewgame") TT.clear();
+ else if (token == "go") go(pos, is);
+ else if (token == "position") position(pos, is);
+ else if (token == "setoption") setoption(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
+ sync_cout << "Unknown command: " << cmd << sync_endl;
+
+ } while (token != "quit" && args.empty()); // Args have one-shot behaviour
+
+ Threads.wait_for_think_finished(); // Cannot quit while search is running
}
namespace {
- // set_position() is called when engine receives the "position" UCI command.
+ // position() is called when engine receives the "position" UCI command.
// The function sets up the position described in the given fen string ("fen")
// or the starting position ("startpos") and then makes the moves given in the
// following move list ("moves").
- void set_position(Position& pos, istringstream& is) {
+ void position(Position& pos, istringstream& is) {
Move m;
string token, fen;
@@ -174,7 +150,7 @@ namespace {
else
return;
- pos.from_fen(fen, Options["UCI_Chess960"], Threads.main_thread());
+ pos.set(fen, Options["UCI_Chess960"], Threads.main());
SetupStates = Search::StateStackPtr(new std::stack());
// Parse move list (if any)
@@ -186,10 +162,10 @@ namespace {
}
- // set_option() is called when engine receives the "setoption" UCI command. The
+ // setoption() is called when engine receives the "setoption" UCI command. The
// function updates the UCI option ("name") to the given value ("value").
- void set_option(istringstream& is) {
+ void setoption(istringstream& is) {
string token, name, value;
@@ -206,15 +182,15 @@ 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) {
+ void go(const Position& pos, istringstream& is) {
Search::LimitsType limits;
vector searchMoves;
@@ -222,31 +198,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, SetupStates);
+ Threads.start_thinking(pos, limits, searchMoves, SetupStates);
}
}