X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuci.cpp;h=3a33b9f4a07170828a9f55ac5af228a1aa930257;hb=def50020ad0f0c093ae66a2725203a1000931d1a;hp=49a0b22fd6723a89bbbc87174240dc0a125be197;hpb=e1191b35e85cbf0d488d747ac26cdf13e1fa0f9a;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index 49a0b22f..3a33b9f4 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
@@ -41,10 +42,11 @@ namespace {
// 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;
+ Search::MovesVectPtr SetupMoves;
void set_option(istringstream& up);
void set_position(Position& pos, istringstream& up);
- void go(Position& pos, istringstream& up);
+ void go(const Position& pos, istringstream& up);
}
@@ -66,23 +68,20 @@ void UCI::loop(const string& args) {
is >> skipws >> token;
- if (token == "quit" || token == "stop")
+ if (token == "quit" || token == "stop" || token == "ponderhit")
{
- Search::Signals.stop = true;
- Threads.main_thread()->wake_up(); // Could be sleeping
- }
- else if (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_thread()->notify_one(); // Could be sleeping
}
+ else
+ Search::Limits.ponder = false;
}
else if (token == "perft" && (is >> token)) // Read perft depth
{
@@ -93,14 +92,17 @@ 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 == "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 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);
@@ -116,7 +118,7 @@ void UCI::loop(const string& args) {
} while (token != "quit" && args.empty()); // Args have one-shot behaviour
- Threads.wait_for_search_finished(); // Cannot quit while search is running
+ Threads.wait_for_think_finished(); // Cannot quit while search is running
}
@@ -147,10 +149,13 @@ namespace {
pos.set(fen, Options["UCI_Chess960"], Threads.main_thread());
SetupStates = Search::StateStackPtr(new std::stack());
+ SetupMoves = Search::MovesVectPtr(new std::vector());
+ SetupMoves->reserve(200); // Try to avoid reallocations
// Parse move list (if any)
while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
{
+ SetupMoves->push_back(m);
SetupStates->push(StateInfo());
pos.do_move(m, SetupStates->top());
}
@@ -185,7 +190,7 @@ namespace {
// 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;
@@ -210,6 +215,6 @@ namespace {
else if (token == "ponder") limits.ponder = true;
}
- Threads.start_searching(pos, limits, searchMoves, SetupStates);
+ Threads.start_thinking(pos, limits, searchMoves, SetupStates, SetupMoves);
}
}