X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=b38bdd6ed51e2848fd60770c936d7a80793e427c;hp=dc4ec05e2f586607453270181e6cd9e7bbe841d6;hb=d909d10f33df023be46a2633608bdf655d1f5a62;hpb=7eaea3848c9e8a388c0b79cee6fba6bf3cd32108 diff --git a/src/thread.cpp b/src/thread.cpp index dc4ec05e..b38bdd6e 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -25,6 +25,7 @@ #include "search.h" #include "thread.h" #include "uci.h" +#include "syzygy/tbprobe.h" ThreadPool Threads; // Global object @@ -169,7 +170,7 @@ int64_t ThreadPool::nodes_searched() { /// ThreadPool::start_thinking() wakes up the main thread sleeping in idle_loop() /// and starts a new search, then returns immediately. -void ThreadPool::start_thinking(const Position& pos, StateListPtr& states, +void ThreadPool::start_thinking(Position& pos, StateListPtr& states, const Search::LimitsType& limits) { main()->wait_for_search_finished(); @@ -183,6 +184,8 @@ void ThreadPool::start_thinking(const Position& pos, StateListPtr& states, || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), m)) rootMoves.push_back(Search::RootMove(m)); + Tablebases::filter_root_moves(pos, rootMoves); + // After ownership transfer 'states' becomes empty, so if we stop the search // and call 'go' again without setting a new position states.get() == NULL. assert(states.get() || setupStates.get()); @@ -190,6 +193,8 @@ void ThreadPool::start_thinking(const Position& pos, StateListPtr& states, if (states.get()) setupStates = std::move(states); // Ownership transfer, states is now empty + StateInfo tmp = setupStates->back(); + for (Thread* th : Threads) { th->maxPly = 0; @@ -198,5 +203,7 @@ void ThreadPool::start_thinking(const Position& pos, StateListPtr& states, th->rootPos.set(pos.fen(), pos.is_chess960(), &setupStates->back(), th); } + setupStates->back() = tmp; // Restore st->previous, cleared by Position::set() + main()->start_searching(); }