#include "book.h"
#include "evaluate.h"
-#include "history.h"
#include "movegen.h"
#include "movepick.h"
#include "notation.h"
TimeManager TimeMgr;
int BestMoveChanges;
Value DrawValue[COLOR_NB];
- History H;
+ History Hist;
+ Gains Gain;
template <NodeType NT>
Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth);
Value value_to_tt(Value v, int ply);
Value value_from_tt(Value v, int ply);
bool check_is_dangerous(Position& pos, Move move, Value futilityBase, Value beta);
- bool yields_to_threat(const Position& pos, Move move, Move threat);
- bool prevents_threat(const Position& pos, Move move, Move threat);
+ bool allows(const Position& pos, Move first, Move second);
+ bool refutes(const Position& pos, Move first, Move second);
string uci_pv(const Position& pos, int depth, Value alpha, Value beta);
struct Skill {
{
RootMoves.push_back(MOVE_NONE);
sync_cout << "info depth 0 score "
- << score_to_uci(RootPos.in_check() ? -VALUE_MATE : VALUE_DRAW)
+ << score_to_uci(RootPos.checkers() ? -VALUE_MATE : VALUE_DRAW)
<< sync_endl;
goto finalize;
}
- if (Options["OwnBook"] && !Limits.infinite)
+ if (Options["OwnBook"] && !Limits.infinite && !Limits.mate)
{
Move bookMove = book.probe(RootPos, Options["Book File"], Options["Best Book Move"]);
if (Options["Contempt Factor"] && !Options["UCI_AnalyseMode"])
{
int cf = Options["Contempt Factor"] * PawnValueMg / 100; // From centipawns
- cf = cf * MaterialTable::game_phase(RootPos) / PHASE_MIDGAME; // Scale down with phase
+ cf = cf * Material::game_phase(RootPos) / PHASE_MIDGAME; // Scale down with phase
DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
DrawValue[~RootColor] = VALUE_DRAW + Value(cf);
}
<< 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())
bestValue = delta = -VALUE_INFINITE;
ss->currentMove = MOVE_NULL; // Hack to skip update gains
TT.new_search();
- H.clear();
+ Hist.clear();
+ Gain.clear();
PVSize = Options["MultiPV"];
Skill skill(Options["Skill Level"]);
// Sort the PV lines searched so far and update the GUI
sort<RootMove>(RootMoves.begin(), RootMoves.begin() + PVIdx + 1);
- sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
+
+ if (PVIdx + 1 == PVSize || Time::now() - SearchTime > 3000)
+ sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
}
// Do we need to pick now the sub-optimal best move ?
if (depth > 2 && BestMoveChanges)
bestMoveNeverChanged = false;
+ // Do we have found a "mate in x"?
+ if ( Limits.mate
+ && bestValue >= VALUE_MATE_IN_MAX_PLY
+ && VALUE_MATE - bestValue <= 2 * Limits.mate)
+ Signals.stop = true;
+
// Do we have time for the next iteration? Can we stop searching now?
if (Limits.use_time_management() && !Signals.stopOnPonderhit)
{
// Step 1. Initialize node
Thread* thisThread = pos.this_thread();
moveCount = playedMoveCount = 0;
- inCheck = pos.in_check();
+ inCheck = pos.checkers();
if (SpNode)
{
if (!RootNode)
{
// Step 2. Check for aborted search and immediate draw
- if (Signals.stop || pos.is_draw<true, PvNode>() || ss->ply > MAX_PLY)
+ if (Signals.stop || pos.is_draw<false>() || ss->ply > MAX_PLY)
return DrawValue[pos.side_to_move()];
// Step 3. Mate distance pruning. Even if we mate at the next move our score
else if (tte)
{
- // Following asserts are valid only in single thread condition because
- // TT access is always racy and its contents cannot be trusted.
- assert(tte->static_value() != VALUE_NONE || Threads.size() > 1);
- assert(ttValue != VALUE_NONE || tte->type() == BOUND_NONE || Threads.size() > 1);
-
- ss->staticEval = eval = tte->static_value();
- ss->evalMargin = tte->static_value_margin();
-
- if (eval == VALUE_NONE || ss->evalMargin == VALUE_NONE) // Due to a race
+ // Never assume anything on values stored in TT
+ if ( (ss->staticEval = eval = tte->static_value()) == VALUE_NONE
+ ||(ss->evalMargin = tte->static_value_margin()) == VALUE_NONE)
eval = ss->staticEval = evaluate(pos, ss->evalMargin);
// Can ttValue be used as a better position evaluation?
&& type_of(move) == NORMAL)
{
Square to = to_sq(move);
- H.update_gain(pos.piece_on(to), to, -(ss-1)->staticEval - ss->staticEval);
+ Gain.update(pos.piece_on(to), to, -(ss-1)->staticEval - ss->staticEval);
}
// Step 6. Razoring (is omitted in PV nodes)
if (eval - PawnValueMg > beta)
R += ONE_PLY;
- pos.do_null_move<true>(st);
+ pos.do_null_move(st);
(ss+1)->skipNullMove = true;
nullValue = depth-R < ONE_PLY ? -qsearch<NonPV, false>(pos, ss+1, -beta, -alpha, DEPTH_ZERO)
: - search<NonPV>(pos, ss+1, -beta, -alpha, depth-R);
(ss+1)->skipNullMove = false;
- pos.do_null_move<false>(st);
+ pos.undo_null_move();
if (nullValue >= beta)
{
if ( depth < 5 * ONE_PLY
&& (ss-1)->reduction
&& threatMove != MOVE_NONE
- && yields_to_threat(pos, (ss-1)->currentMove, threatMove))
+ && allows(pos, (ss-1)->currentMove, threatMove))
return beta - 1;
}
}
assert((ss-1)->currentMove != MOVE_NONE);
assert((ss-1)->currentMove != MOVE_NULL);
- MovePicker mp(pos, ttMove, H, pos.captured_piece_type());
+ MovePicker mp(pos, ttMove, Hist, pos.captured_piece_type());
CheckInfo ci(pos);
while ((move = mp.next_move<false>()) != MOVE_NONE)
split_point_start: // At split points actual search starts from here
- MovePicker mp(pos, ttMove, depth, H, ss, PvNode ? -VALUE_INFINITE : beta);
+ MovePicker mp(pos, ttMove, depth, Hist, ss, PvNode ? -VALUE_INFINITE : beta);
CheckInfo ci(pos);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
singularExtensionNode = !RootNode
{
Signals.firstRootMove = (moveCount == 1);
- if (thisThread == Threads.main_thread() && Time::now() - SearchTime > 2000)
+ if (thisThread == Threads.main_thread() && Time::now() - SearchTime > 3000)
sync_cout << "info depth " << depth / ONE_PLY
<< " currmove " << move_to_uci(move, pos.is_chess960())
<< " currmovenumber " << moveCount + PVIdx << sync_endl;
ss->excludedMove = MOVE_NONE;
if (value < rBeta)
- ext = rBeta >= beta ? ONE_PLY + ONE_PLY / 2 : ONE_PLY;
+ ext = ONE_PLY;
}
// Update current move (this must be done after singular extension search)
// Move count based pruning
if ( depth < 16 * ONE_PLY
&& moveCount >= FutilityMoveCounts[depth]
- && (!threatMove || !prevents_threat(pos, move, threatMove)))
+ && (!threatMove || !refutes(pos, move, threatMove)))
{
if (SpNode)
sp->mutex.lock();
// but fixing this made program slightly weaker.
Depth predictedDepth = newDepth - reduction<PvNode>(depth, moveCount);
futilityValue = ss->staticEval + ss->evalMargin + futility_margin(predictedDepth, moveCount)
- + H.gain(pos.piece_moved(move), to_sq(move));
+ + Gain[pos.piece_moved(move)][to_sq(move)];
if (futilityValue < beta)
{
}
// Check for legality only before to do the move
- if (!pos.pl_move_is_legal(move, ci.pinned))
+ if (!RootNode && !SpNode && !pos.pl_move_is_legal(move, ci.pinned))
{
moveCount--;
continue;
}
- pvMove = PvNode ? moveCount == 1 : false;
+ pvMove = PvNode && moveCount == 1;
ss->currentMove = move;
if (!SpNode && !captureOrPromotion && playedMoveCount < 64)
movesSearched[playedMoveCount++] = move;
&& !pvMove
&& !captureOrPromotion
&& !dangerous
- && ss->killers[0] != move
- && ss->killers[1] != move)
+ && move != ttMove
+ && move != ss->killers[0]
+ && move != ss->killers[1])
{
ss->reduction = reduction<PvNode>(depth, moveCount);
Depth d = std::max(newDepth - ss->reduction, ONE_PLY);
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;
- }
- else // Fail high
+ if (PvNode && value < beta) // Update alpha! Always alpha < beta
+ alpha = SpNode ? sp->alpha = value : value;
+ else
{
- if (SpNode) sp->cutoff = true;
+ assert(value >= beta); // Fail high
+
+ if (SpNode)
+ sp->cutoff = true;
+
break;
}
}
// Step 19. Check for splitting the search
if ( !SpNode
- && depth >= Threads.min_split_depth()
- && bestValue < beta
- && Threads.available_slave_exists(thisThread))
+ && depth >= Threads.minimumSplitDepth
+ && Threads.slave_available(thisThread)
+ && thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD)
{
+ assert(bestValue < beta);
+
bestValue = Threads.split<FakeSplit>(pos, ss, alpha, beta, bestValue, &bestMove,
depth, threatMove, moveCount, mp, NT);
if (bestValue >= beta)
// Increase history value of the cut-off move
Value bonus = Value(int(depth) * int(depth));
- H.add(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
+ Hist.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
// Decrease history of all the other played non-capture moves
for (int i = 0; i < playedMoveCount - 1; i++)
{
Move m = movesSearched[i];
- H.add(pos.piece_moved(m), to_sq(m), -bonus);
+ Hist.update(pos.piece_moved(m), to_sq(m), -bonus);
}
}
}
const bool PvNode = (NT == PV);
assert(NT == PV || NT == NonPV);
- assert(InCheck == pos.in_check());
+ assert(InCheck == !!pos.checkers());
assert(alpha >= -VALUE_INFINITE && alpha < beta && beta <= VALUE_INFINITE);
assert(PvNode || (alpha == beta - 1));
assert(depth <= DEPTH_ZERO);
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)
+ if (pos.is_draw<true>() || ss->ply > MAX_PLY)
return DrawValue[pos.side_to_move()];
// Transposition table lookup. At PV nodes, we don't use the TT for
}
else
{
- if (fromNull)
- {
- ss->staticEval = bestValue = -(ss-1)->staticEval;
- ss->evalMargin = VALUE_ZERO;
- }
- else if (tte)
+ if (tte)
{
- assert(tte->static_value() != VALUE_NONE || Threads.size() > 1);
-
- ss->staticEval = bestValue = tte->static_value();
- ss->evalMargin = tte->static_value_margin();
-
- if (ss->staticEval == VALUE_NONE || ss->evalMargin == VALUE_NONE) // Due to a race
+ // Never assume anything on values stored in TT
+ if ( (ss->staticEval = bestValue = tte->static_value()) == VALUE_NONE
+ ||(ss->evalMargin = tte->static_value_margin()) == VALUE_NONE)
ss->staticEval = bestValue = evaluate(pos, ss->evalMargin);
}
else
// to search the moves. Because the depth is <= 0 here, only captures,
// queen promotions and checks (only if depth >= DEPTH_QS_CHECKS) will
// be generated.
- MovePicker mp(pos, ttMove, depth, H, to_sq((ss-1)->currentMove));
+ MovePicker mp(pos, ttMove, depth, Hist, to_sq((ss-1)->currentMove));
CheckInfo ci(pos);
// Loop through the moves until no moves remain or a beta cutoff occurs
if ( !PvNode
&& !InCheck
&& !givesCheck
- && !fromNull
&& move != ttMove
&& enoughMaterial
&& type_of(move) != PROMOTION
if (futilityValue < beta)
{
- if (futilityValue > bestValue)
- bestValue = futilityValue;
-
+ bestValue = std::max(bestValue, futilityValue);
continue;
}
if ( futilityBase < beta
&& depth < DEPTH_ZERO
&& pos.see(move) <= 0)
+ {
+ bestValue = std::max(bestValue, futilityBase);
continue;
+ }
}
// Detect non-capture evasions that are candidate to be pruned
}
- // yields_to_threat() tests whether the move at previous ply yields to the so
- // called threat move (the best move returned from a null search that fails
- // low). Here 'yields to' means that the move somehow made the threat possible
- // for instance if the moving piece is the same in both moves.
+ // allows() tests whether the 'first' move at previous ply somehow makes the
+ // 'second' move possible, for instance if the moving piece is the same in
+ // both moves. Normally the second move is the threat (the best move returned
+ // from a null search that fails low).
- bool yields_to_threat(const Position& pos, Move move, Move threat) {
+ bool allows(const Position& pos, Move first, Move second) {
- assert(is_ok(move));
- assert(is_ok(threat));
- assert(color_of(pos.piece_on(from_sq(threat))) == ~pos.side_to_move());
+ assert(is_ok(first));
+ assert(is_ok(second));
+ assert(color_of(pos.piece_on(from_sq(second))) == ~pos.side_to_move());
+ assert(color_of(pos.piece_on(to_sq(first))) == ~pos.side_to_move());
- Square mfrom = from_sq(move);
- Square mto = to_sq(move);
- Square tfrom = from_sq(threat);
- Square tto = to_sq(threat);
+ Square m1from = from_sq(first);
+ Square m2from = from_sq(second);
+ Square m1to = to_sq(first);
+ Square m2to = to_sq(second);
- // The piece is the same or threat's destination was vacated by the move
- if (mto == tfrom || tto == mfrom)
+ // The piece is the same or second's destination was vacated by the first move
+ if (m1to == m2from || m2to == m1from)
return true;
- // Threat moves through the vacated square
- if (between_bb(tfrom, tto) & mfrom)
+ // Second one moves through the square vacated by first one
+ if (between_bb(m2from, m2to) & m1from)
return true;
- // Threat's destination is defended by the move's piece
- Bitboard matt = pos.attacks_from(pos.piece_on(mto), mto, pos.pieces() ^ tfrom);
- if (matt & tto)
+ // Second's destination is defended by the first move's piece
+ Bitboard m1att = pos.attacks_from(pos.piece_on(m1to), m1to, pos.pieces() ^ m2from);
+ if (m1att & m2to)
return true;
- // Threat gives a discovered check through the move's checking piece
- if (matt & pos.king_square(pos.side_to_move()))
+ // Second move gives a discovered check through the first's checking piece
+ if (m1att & pos.king_square(pos.side_to_move()))
{
- assert(between_bb(mto, pos.king_square(pos.side_to_move())) & tfrom);
+ assert(between_bb(m1to, pos.king_square(pos.side_to_move())) & m2from);
return true;
}
}
- // prevents_threat() tests whether a move is able to defend against the so
- // called threat move (the best move returned from a null search that fails
- // low). In this case will not be pruned.
+ // refutes() tests whether a 'first' move is able to defend against a 'second'
+ // opponent's move. In this case will not be pruned. Normally the second move
+ // is the threat (the best move returned from a null search that fails low).
- bool prevents_threat(const Position& pos, Move move, Move threat) {
+ bool refutes(const Position& pos, Move first, Move second) {
- assert(is_ok(move));
- assert(is_ok(threat));
- assert(!pos.is_capture_or_promotion(move));
- assert(!pos.is_passed_pawn_push(move));
+ assert(is_ok(first));
+ assert(is_ok(second));
- Square mfrom = from_sq(move);
- Square mto = to_sq(move);
- Square tfrom = from_sq(threat);
- Square tto = to_sq(threat);
+ Square m1from = from_sq(first);
+ Square m2from = from_sq(second);
+ Square m1to = to_sq(first);
+ Square m2to = to_sq(second);
// Don't prune moves of the threatened piece
- if (mfrom == tto)
+ if (m1from == m2to)
return true;
// If the threatened piece has value less than or equal to the value of the
// threat piece, don't prune moves which defend it.
- if ( pos.is_capture(threat)
- && ( PieceValue[MG][pos.piece_on(tfrom)] >= PieceValue[MG][pos.piece_on(tto)]
- || type_of(pos.piece_on(tfrom)) == KING))
+ if ( pos.is_capture(second)
+ && ( PieceValue[MG][pos.piece_on(m2from)] >= PieceValue[MG][pos.piece_on(m2to)]
+ || type_of(pos.piece_on(m2from)) == KING))
{
// Update occupancy as if the piece and the threat are moving
- Bitboard occ = pos.pieces() ^ mfrom ^ mto ^ tfrom;
- Piece piece = pos.piece_on(mfrom);
+ Bitboard occ = pos.pieces() ^ m1from ^ m1to ^ m2from;
+ Piece piece = pos.piece_on(m1from);
// The moved piece attacks the square 'tto' ?
- if (pos.attacks_from(piece, mto, occ) & tto)
+ if (pos.attacks_from(piece, m1to, occ) & m2to)
return true;
// Scan for possible X-ray attackers behind the moved piece
- Bitboard xray = (attacks_bb< ROOK>(tto, occ) & pos.pieces(color_of(piece), QUEEN, ROOK))
- | (attacks_bb<BISHOP>(tto, occ) & pos.pieces(color_of(piece), QUEEN, BISHOP));
+ Bitboard xray = (attacks_bb< ROOK>(m2to, occ) & pos.pieces(color_of(piece), QUEEN, ROOK))
+ | (attacks_bb<BISHOP>(m2to, occ) & pos.pieces(color_of(piece), QUEEN, BISHOP));
// Verify attackers are triggered by our move and not already existing
- if (xray && (xray ^ (xray & pos.attacks_from<QUEEN>(tto))))
+ if (xray && (xray ^ (xray & pos.attacks_from<QUEEN>(m2to))))
return true;
}
// Don't prune safe moves which block the threat path
- if ((between_bb(tfrom, tto) & mto) && pos.see_sign(move) >= 0)
+ if ((between_bb(m2from, m2to) & m1to) && pos.see_sign(first) >= 0)
return true;
return false;
do {
pv.push_back(m);
- assert(pos.move_is_legal(pv[ply]));
+ assert(MoveList<LEGAL>(pos).contains(pv[ply]));
+
pos.do_move(pv[ply++], *st++);
tte = TT.probe(pos.key());
&& pos.is_pseudo_legal(m = tte->move()) // Local copy, TT could change
&& pos.pl_move_is_legal(m, pos.pinned_pieces())
&& ply < MAX_PLY
- && (!pos.is_draw<true, true>() || ply < 2));
+ && (!pos.is_draw<false>() || ply < 2));
pv.push_back(MOVE_NONE); // Must be zero-terminating
StateInfo state[MAX_PLY_PLUS_2], *st = state;
TTEntry* tte;
int ply = 0;
- Value v, m;
do {
tte = TT.probe(pos.key());
if (!tte || tte->move() != pv[ply]) // Don't overwrite correct entries
- {
- if (pos.in_check())
- v = m = VALUE_NONE;
- else
- v = evaluate(pos, m);
+ TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[ply], VALUE_NONE, VALUE_NONE);
- TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[ply], v, m);
- }
+ assert(MoveList<LEGAL>(pos).contains(pv[ply]));
- assert(pos.move_is_legal(pv[ply]));
pos.do_move(pv[ply++], *st++);
} while (pv[ply] != MOVE_NONE);
void Thread::idle_loop() {
- // Pointer 'sp_master', if non-NULL, points to the active SplitPoint
- // object for which the thread is the master.
- const SplitPoint* sp_master = splitPointsCnt ? curSplitPoint : NULL;
+ // Pointer 'this_sp' is not null only if we are called from split(), and not
+ // at the thread creation. So it means we are the split point's master.
+ const SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : NULL;
- assert(!sp_master || (sp_master->master == this && is_searching));
+ assert(!this_sp || (this_sp->masterThread == this && searching));
- // If this thread is the master of a split point and all slaves have
- // finished their work at this split point, return from the idle loop.
- while (!sp_master || sp_master->slavesMask)
+ // If this thread is the master of a split point and all slaves have finished
+ // their work at this split point, return from the idle loop.
+ while (!this_sp || this_sp->slavesMask)
{
- // 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()))
+ // If we are not searching, wait for a condition to be signaled instead of
+ // wasting CPU time polling for work.
+ while ((!searching && Threads.sleepWhileIdle) || exit)
{
- if (do_exit)
+ if (exit)
{
- assert(!sp_master);
+ assert(!this_sp);
return;
}
- // Grab the lock to avoid races with Thread::wake_up()
+ // Grab the lock to avoid races with Thread::notify_one()
mutex.lock();
- // If we are master and all slaves have finished don't go to sleep
- if (sp_master && !sp_master->slavesMask)
+ // If we are master and all slaves have finished then exit idle_loop
+ if (this_sp && !this_sp->slavesMask)
{
mutex.unlock();
break;
// Do sleep after retesting sleep conditions under lock protection, in
// 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)
+ // in the meanwhile, allocated us and sent the notify_one() call before
+ // we had the chance to grab the lock.
+ if (!searching && !exit)
sleepCondition.wait(mutex);
mutex.unlock();
}
// If this thread has been assigned work, launch a search
- if (is_searching)
+ if (searching)
{
- assert(!do_sleep && !do_exit);
+ assert(!exit);
Threads.mutex.lock();
- assert(is_searching);
- SplitPoint* sp = curSplitPoint;
+ assert(searching);
+ SplitPoint* sp = activeSplitPoint;
Threads.mutex.unlock();
sp->mutex.lock();
- assert(sp->activePositions[idx] == NULL);
+ assert(sp->slavesPositions[idx] == NULL);
- sp->activePositions[idx] = &pos;
+ sp->slavesPositions[idx] = &pos;
- if (sp->nodeType == Root)
+ switch (sp->nodeType) {
+ case Root:
search<SplitPointRoot>(pos, ss+1, sp->alpha, sp->beta, sp->depth);
- else if (sp->nodeType == PV)
+ break;
+ case PV:
search<SplitPointPV>(pos, ss+1, sp->alpha, sp->beta, sp->depth);
- else if (sp->nodeType == NonPV)
+ break;
+ case NonPV:
search<SplitPointNonPV>(pos, ss+1, sp->alpha, sp->beta, sp->depth);
- else
+ break;
+ default:
assert(false);
+ }
- assert(is_searching);
+ assert(searching);
- is_searching = false;
- sp->activePositions[idx] = NULL;
+ searching = false;
+ sp->slavesPositions[idx] = NULL;
sp->slavesMask &= ~(1ULL << idx);
sp->nodes += pos.nodes_searched();
- // 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()
- && this != sp->master
+ // 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.sleepWhileIdle
+ && this != sp->masterThread
&& !sp->slavesMask)
{
- assert(!sp->master->is_searching);
- sp->master->wake_up();
+ assert(!sp->masterThread->searching);
+ sp->masterThread->notify_one();
}
// After releasing the lock we cannot access anymore any SplitPoint
// Loop across all split points and sum accumulated SplitPoint nodes plus
// all the currently active slaves positions.
for (size_t i = 0; i < Threads.size(); i++)
- for (int j = 0; j < Threads[i].splitPointsCnt; j++)
+ for (int j = 0; j < Threads[i].splitPointsSize; j++)
{
SplitPoint& sp = Threads[i].splitPoints[j];
Bitboard sm = sp.slavesMask;
while (sm)
{
- Position* pos = sp.activePositions[pop_lsb(&sm)];
+ Position* pos = sp.slavesPositions[pop_lsb(&sm)];
nodes += pos ? pos->nodes_searched() : 0;
}
projects / stockfish / blobdiff