X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fuci.cpp;h=c8f504463cef969db7a72c9816d3c23fd6f18b94;hb=19dd0de4ff83e682bafa56d27f302d8f00d3040d;hp=ddaad41725aae83c8161549199649990ca719c68;hpb=a66a7c3870d7b88054d0d6b7c7f734a60fab27f4;p=stockfish
diff --git a/src/uci.cpp b/src/uci.cpp
index ddaad417..c8f50446 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
@@ -44,7 +45,7 @@ namespace {
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,22 +67,17 @@ 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")
- {
- // GUI sends "ponderhit" if we were told to ponder on the same move the
+ // 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
+ // 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 (Search::Signals.stopOnPonderhit)
+ 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;
@@ -95,14 +91,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);
@@ -118,7 +117,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
}
@@ -187,7 +186,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;
@@ -212,6 +211,6 @@ namespace {
else if (token == "ponder") limits.ponder = true;
}
- Threads.start_searching(pos, limits, searchMoves, SetupStates);
+ Threads.start_thinking(pos, limits, searchMoves, SetupStates);
}
}