<< std::endl;
}
- Threads.wake_up();
+ // Reset the threads, still sleeping: will be wake up at split time
+ for (size_t i = 0; i < Threads.size(); i++)
+ Threads[i].maxPly = 0;
+
+ Threads.sleepWhileIdle = Options["Use Sleeping Threads"];
// Set best timer interval to avoid lagging under time pressure. Timer is
// used to check for remaining available thinking time.
- if (Limits.use_time_management())
- Threads.set_timer(std::min(100, std::max(TimeMgr.available_time() / 16,
- TimerResolution)));
- else if (Limits.nodes)
- Threads.set_timer(2 * TimerResolution);
- else
- Threads.set_timer(100);
+ Threads.timer_thread()->msec =
+ Limits.use_time_management() ? std::min(100, std::max(TimeMgr.available_time() / 16, TimerResolution)) :
+ Limits.nodes ? 2 * TimerResolution
+ : 100;
+
+ Threads.timer_thread()->notify_one(); // Wake up the recurring timer
id_loop(RootPos); // Let's start searching !
- Threads.set_timer(0); // Stop timer
- Threads.sleep();
+ Threads.timer_thread()->msec = 0; // Stop the timer
+ Threads.sleepWhileIdle = true; // Send idle threads to sleep
if (Options["Use Search Log"])
{
finalize:
// When we reach max depth we arrive here even without Signals.stop is raised,
- // but if we are pondering or in infinite search, we shouldn't print the best
- // move before we are told to do so.
+ // but if we are pondering or in infinite search, according to UCI protocol,
+ // we shouldn't print the best move before the GUI sends a "stop" or "ponderhit"
+ // command. We simply wait here until GUI sends one of those commands (that
+ // raise Signals.stop).
if (!Signals.stop && (Limits.ponder || Limits.infinite))
- RootPos.this_thread()->wait_for_stop_or_ponderhit();
+ {
+ Signals.stopOnPonderhit = true;
+ RootPos.this_thread()->wait_for(Signals.stop);
+ }
// Best move could be MOVE_NONE when searching on a stalemate position
sync_cout << "bestmove " << move_to_uci(RootMoves[0].pv[0], RootPos.is_chess960())
ss->staticEval, ss->evalMargin);
}
- // Handling of UCI command 'mate in x moves'. We simply return if after
- // 'x' moves we still have not checkmated the opponent.
- if (PvNode && !RootNode && !inCheck && Limits.mate && ss->ply > 2 * Limits.mate)
- return eval;
-
// Update gain for the parent non-capture move given the static position
// evaluation before and after the move.
if ( (move = (ss-1)->currentMove) != MOVE_NULL
continue;
}
- pvMove = PvNode ? moveCount == 1 : false;
+ pvMove = PvNode && moveCount == 1;
ss->currentMove = move;
if (!SpNode && !captureOrPromotion && playedMoveCount < 64)
movesSearched[playedMoveCount++] = move;
if (value > bestValue)
{
- bestValue = value;
- if (SpNode) sp->bestValue = value;
+ bestValue = SpNode ? sp->bestValue = value : value;
if (value > alpha)
{
- bestMove = move;
- if (SpNode) sp->bestMove = move;
+ bestMove = SpNode ? sp->bestMove = move : move;
- if (PvNode && value < beta)
- {
- alpha = value; // Update alpha here! Always alpha < beta
- if (SpNode) sp->alpha = value;
- }
+ if (PvNode && value < beta) // Update alpha! Always alpha < beta
+ alpha = SpNode ? sp->alpha = value : value;
else
{
assert(value >= beta); // Fail high
- if (SpNode) sp->cutoff = true;
+ if (SpNode)
+ sp->cutoff = true;
+
break;
}
}
Key posKey;
Move ttMove, move, bestMove;
Value bestValue, value, ttValue, futilityValue, futilityBase, oldAlpha;
- bool givesCheck, enoughMaterial, evasionPrunable, fromNull;
+ bool givesCheck, enoughMaterial, evasionPrunable;
Depth ttDepth;
// To flag BOUND_EXACT a node with eval above alpha and no available moves
ss->currentMove = bestMove = MOVE_NONE;
ss->ply = (ss-1)->ply + 1;
- fromNull = (ss-1)->currentMove == MOVE_NULL;
// Check for an instant draw or maximum ply reached
if (pos.is_draw<false, false>() || ss->ply > MAX_PLY)
}
else
{
- if (fromNull)
- {
- // Approximated score. Real one is slightly higher due to tempo
- ss->staticEval = bestValue = -(ss-1)->staticEval;
- ss->evalMargin = VALUE_ZERO;
- }
- else if (tte)
+ if (tte)
{
// Never assume anything on values stored in TT
if ( (ss->staticEval = bestValue = tte->static_value()) == VALUE_NONE
// Futility pruning
if ( !PvNode
&& !InCheck
- && !fromNull
&& !givesCheck
&& move != ttMove
&& enoughMaterial
{
// If we are not searching, wait for a condition to be signaled
// instead of wasting CPU time polling for work.
- while ( do_sleep
- || do_exit
- || (!is_searching && Threads.use_sleeping_threads()))
+ while (do_exit || (!is_searching && Threads.sleepWhileIdle))
{
if (do_exit)
{
// particular we need to avoid a deadlock in case a master thread has,
// in the meanwhile, allocated us and sent the wake_up() call before we
// had the chance to grab the lock.
- if (do_sleep || !is_searching)
+ if (!is_searching && Threads.sleepWhileIdle)
sleepCondition.wait(mutex);
mutex.unlock();
// If this thread has been assigned work, launch a search
if (is_searching)
{
- assert(!do_sleep && !do_exit);
+ assert(!do_exit);
Threads.mutex.lock();
// Wake up master thread so to allow it to return from the idle loop in
// case we are the last slave of the split point.
- if ( Threads.use_sleeping_threads()
+ if ( Threads.sleepWhileIdle
&& this != sp->master
&& !sp->slavesMask)
{
assert(!sp->master->is_searching);
- sp->master->wake_up();
+ sp->master->notify_one();
}
// After releasing the lock we cannot access anymore any SplitPoint
projects / stockfish / blobdiff