volatile SignalsType Signals;
LimitsType Limits;
std::vector<Move> RootMoves;
- Position* RootPosition;
+ Position RootPosition;
}
namespace {
void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount);
void do_skill_level(Move* best, Move* ponder);
- int elapsed_search_time(int set = 0);
+ int elapsed_time(bool reset = false);
string score_to_uci(Value v, Value alpha = -VALUE_INFINITE, Value beta = VALUE_INFINITE);
string speed_to_uci(int64_t nodes);
string pv_to_uci(const Move pv[], int pvNum, bool chess960);
static Book book; // Defined static to initialize the PRNG only once
- Position& pos = *RootPosition;
+ Position& pos = RootPosition;
- // Save "search start" time and reset elapsed time to zero
- elapsed_search_time(get_system_time());
-
- // Reset global search signals
- memset((void*)&Signals, 0, sizeof(Signals));
+ // Reset elapsed search time
+ elapsed_time(true);
// Set output stream mode: normal or chess960. Castling notation is different
cout << set960(pos.is_chess960());
// Write current search final statistics to log file
if (Options["Use Search Log"].value<bool>())
{
- int e = elapsed_search_time();
+ int e = elapsed_time();
Log log(Options["Search Log Filename"].value<string>());
log << "Nodes: " << pos.nodes_searched()
// if we have a fail high/low and we are deep in the search. UCI
// protocol requires to send all the PV lines also if are still
// to be searched and so refer to the previous search's score.
- if ((bestValue > alpha && bestValue < beta) || elapsed_search_time() > 2000)
+ if ((bestValue > alpha && bestValue < beta) || elapsed_time() > 2000)
for (int i = 0; i < std::min(UCIMultiPV, (int)Rml.size()); i++)
{
bool updated = (i <= MultiPVIdx);
if (Options["Use Search Log"].value<bool>())
{
Log log(Options["Search Log Filename"].value<string>());
- log << pretty_pv(pos, depth, bestValue, elapsed_search_time(), &Rml[0].pv[0]) << endl;
+ log << pretty_pv(pos, depth, bestValue, elapsed_time(), &Rml[0].pv[0]) << endl;
}
// Filter out startup noise when monitoring best move stability
// Do we have time for the next iteration? Can we stop searching now?
if (!Signals.stop && !Signals.stopOnPonderhit && Limits.useTimeManagement())
{
+ bool stop = false; // Local variable instead of the volatile Signals.stop
+
// Take in account some extra time if the best move has changed
if (depth > 4 && depth < 50)
TimeMgr.pv_instability(bestMoveChanges[depth], bestMoveChanges[depth - 1]);
// Stop search if most of available time is already consumed. We probably don't
// have enough time to search the first move at the next iteration anyway.
- if (elapsed_search_time() > (TimeMgr.available_time() * 62) / 100)
- Signals.stop = true;
+ if (elapsed_time() > (TimeMgr.available_time() * 62) / 100)
+ stop = true;
// Stop search early if one move seems to be much better than others
if ( depth >= 10
- && !Signals.stop
+ && !stop
&& ( bestMoveNeverChanged
- || elapsed_search_time() > (TimeMgr.available_time() * 40) / 100))
+ || elapsed_time() > (TimeMgr.available_time() * 40) / 100))
{
Value rBeta = bestValue - EasyMoveMargin;
(ss+1)->excludedMove = bestMove;
(ss+1)->excludedMove = MOVE_NONE;
if (v < rBeta)
- Signals.stop = true;
+ stop = true;
}
- // If we are allowed to ponder do not stop the search now but keep pondering
- if (Signals.stop && Limits.ponder) // FIXME Limits.ponder is racy
+ if (stop)
{
- Signals.stop = false;
- Signals.stopOnPonderhit = true;
+ // If we are allowed to ponder do not stop the search now but
+ // keep pondering until GUI sends "ponderhit" or "stop".
+ if (Limits.ponder) // FIXME racing
+ Signals.stopOnPonderhit = true;
+ else
+ Signals.stop = true;
}
}
}
nodes = pos.nodes_searched();
// For long searches send current move info to GUI
- if (pos.thread() == 0 && elapsed_search_time() > 2000)
+ if (pos.thread() == 0 && elapsed_time() > 2000)
cout << "info" << depth_to_uci(depth)
<< " currmove " << move
<< " currmovenumber " << moveCount + MultiPVIdx << endl;
// current_search_time() returns the number of milliseconds which have passed
// since the beginning of the current search.
- int elapsed_search_time(int set) {
+ int elapsed_time(bool reset) {
static int searchStartTime;
- if (set)
- searchStartTime = set;
+ if (reset)
+ searchStartTime = get_system_time();
return get_system_time() - searchStartTime;
}
string speed_to_uci(int64_t nodes) {
std::stringstream s;
- int t = elapsed_search_time();
+ int t = elapsed_time();
s << " nodes " << nodes
<< " nps " << (t > 0 ? int(nodes * 1000 / t) : 0)
void do_timer_event() {
static int lastInfoTime;
- int e = elapsed_search_time();
+ int e = elapsed_time();
// Print debug information every one second
if (!lastInfoTime || get_system_time() - lastInfoTime >= 1000)