X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=b38bdd6ed51e2848fd60770c936d7a80793e427c;hp=1f5dc82350e50bdfbcbf0bc578a239d3314b7ea4;hb=ca14345ba26fc40e1039029659f57028f510502f;hpb=99ae47716ac605286e60634632cb5eccac9a63ce
diff --git a/src/thread.cpp b/src/thread.cpp
index 1f5dc823..b38bdd6e 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -1,7 +1,8 @@
/*
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-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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,373 +18,192 @@
along with this program. If not, see .
*/
+#include // For std::count
#include
-#include
#include "movegen.h"
#include "search.h"
#include "thread.h"
-#include "ucioption.h"
-
-using namespace Search;
+#include "uci.h"
+#include "syzygy/tbprobe.h"
ThreadPool Threads; // Global object
-namespace { extern "C" {
-
- // start_routine() is the C function which is called when a new thread
- // is launched. It is a wrapper to member function pointed by start_fn.
-
- long start_routine(Thread* th) { (th->*(th->start_fn))(); return 0; }
-
-} }
-
+/// Thread constructor launches the thread and then waits until it goes to sleep
+/// in idle_loop().
-// Thread c'tor starts a newly-created thread of execution that will call
-// the idle loop function pointed by start_fn going immediately to sleep.
+Thread::Thread() {
-Thread::Thread(Fn fn) : splitPoints() {
+ resetCalls = exit = false;
+ maxPly = callsCnt = 0;
+ history.clear();
+ counterMoves.clear();
+ idx = Threads.size(); // Start from 0
- is_searching = do_exit = false;
- maxPly = splitPointsCnt = 0;
- curSplitPoint = NULL;
- start_fn = fn;
- idx = Threads.size();
-
- do_sleep = (fn != &Thread::main_loop); // Avoid a race with start_searching()
-
- if (!thread_create(handle, start_routine, this))
- {
- std::cerr << "Failed to create thread number " << idx << std::endl;
- ::exit(EXIT_FAILURE);
- }
+ std::unique_lock lk(mutex);
+ searching = true;
+ nativeThread = std::thread(&Thread::idle_loop, this);
+ sleepCondition.wait(lk, [&]{ return !searching; });
}
-// Thread d'tor waits for thread termination before to return.
+/// Thread destructor waits for thread termination before returning
Thread::~Thread() {
- assert(do_sleep);
-
- do_exit = true; // Search must be already finished
- notify_one();
- thread_join(handle); // Wait for thread termination
+ mutex.lock();
+ exit = true;
+ sleepCondition.notify_one();
+ mutex.unlock();
+ nativeThread.join();
}
-// Thread::timer_loop() is where the timer thread waits maxPly milliseconds and
-// then calls check_time(). If maxPly is 0 thread sleeps until is woken up.
-extern void check_time();
+/// Thread::wait_for_search_finished() waits on sleep condition
+/// until not searching
-void Thread::timer_loop() {
+void Thread::wait_for_search_finished() {
- while (!do_exit)
- {
- mutex.lock();
- while (!maxPly && !do_exit)
- sleepCondition.wait_for(mutex, maxPly ? maxPly : INT_MAX);
- mutex.unlock();
- check_time();
- }
+ std::unique_lock lk(mutex);
+ sleepCondition.wait(lk, [&]{ return !searching; });
}
-// Thread::main_loop() is where the main thread is parked waiting to be started
-// when there is a new search. Main thread will launch all the slave threads.
-
-void Thread::main_loop() {
-
- while (true)
- {
- mutex.lock();
-
- do_sleep = true; // Always return to sleep after a search
- is_searching = false;
-
- while (do_sleep && !do_exit)
- {
- Threads.sleepCondition.notify_one(); // Wake up UI thread if needed
- sleepCondition.wait(mutex);
- }
-
- mutex.unlock();
+/// Thread::wait() waits on sleep condition until condition is true
- if (do_exit)
- return;
+void Thread::wait(std::atomic_bool& condition) {
- is_searching = true;
-
- Search::think();
-
- assert(is_searching);
- }
+ std::unique_lock lk(mutex);
+ sleepCondition.wait(lk, [&]{ return bool(condition); });
}
-// Thread::notify_one() wakes up the thread, normally at the beginning of the
-// search or, if "sleeping threads" is used at split time.
-
-void Thread::notify_one() {
-
- mutex.lock();
- sleepCondition.notify_one();
- mutex.unlock();
-}
+/// Thread::start_searching() wakes up the thread that will start the search
+void Thread::start_searching(bool resume) {
-// Thread::wait_for() set the thread to sleep until condition 'b' turns true
+ std::unique_lock lk(mutex);
-void Thread::wait_for(volatile const bool& b) {
+ if (!resume)
+ searching = true;
- mutex.lock();
- while (!b) sleepCondition.wait(mutex);
- mutex.unlock();
+ sleepCondition.notify_one();
}
-// Thread::cutoff_occurred() checks whether a beta cutoff has occurred in the
-// current active split point, or in some ancestor of the split point.
-
-bool Thread::cutoff_occurred() const {
+/// Thread::idle_loop() is where the thread is parked when it has no work to do
- for (SplitPoint* sp = curSplitPoint; sp; sp = sp->parent)
- if (sp->cutoff)
- return true;
+void Thread::idle_loop() {
- return false;
-}
-
-
-// Thread::is_available_to() checks whether the thread is available to help the
-// thread 'master' at a split point. An obvious requirement is that thread must
-// be idle. With more than two threads, this is not sufficient: If the thread is
-// the master of some active split point, it is only available as a slave to the
-// slaves which are busy searching the split point at the top of slaves split
-// point stack (the "helpful master concept" in YBWC terminology).
+ while (!exit)
+ {
+ std::unique_lock lk(mutex);
-bool Thread::is_available_to(Thread* master) const {
+ searching = false;
- if (is_searching)
- return false;
+ while (!searching && !exit)
+ {
+ sleepCondition.notify_one(); // Wake up any waiting thread
+ sleepCondition.wait(lk);
+ }
- // Make a local copy to be sure doesn't become zero under our feet while
- // testing next condition and so leading to an out of bound access.
- int spCnt = splitPointsCnt;
+ lk.unlock();
- // No active split points means that the thread is available as a slave for any
- // other thread otherwise apply the "helpful master" concept if possible.
- return !spCnt || (splitPoints[spCnt - 1].slavesMask & (1ULL << master->idx));
+ if (!exit)
+ search();
+ }
}
-// init() is called at startup. Initializes lock and condition variable and
-// launches requested threads sending them immediately to sleep. We cannot use
-// a c'tor becuase Threads is a static object and we need a fully initialized
-// engine at this point due to allocation of endgames in Thread c'tor.
+/// ThreadPool::init() creates and launches requested threads that will go
+/// immediately to sleep. We cannot use a constructor because Threads is a
+/// static object and we need a fully initialized engine at this point due to
+/// allocation of Endgames in the Thread constructor.
void ThreadPool::init() {
- timer = new Thread(&Thread::timer_loop);
- threads.push_back(new Thread(&Thread::main_loop));
+ push_back(new MainThread);
read_uci_options();
}
-// exit() cleanly terminates the threads before the program exits.
+/// ThreadPool::exit() terminates threads before the program exits. Cannot be
+/// done in destructor because threads must be terminated before deleting any
+/// static objects while still in main().
void ThreadPool::exit() {
- delete timer; // As first becuase check_time() accesses threads data
-
- for (size_t i = 0; i < threads.size(); i++)
- delete threads[i];
+ while (size())
+ delete back(), pop_back();
}
-// read_uci_options() updates internal threads parameters from the corresponding
-// UCI options and creates/destroys threads to match the requested number. Thread
-// objects are dynamically allocated to avoid creating in advance all possible
-// threads, with included pawns and material tables, if only few are used.
+/// ThreadPool::read_uci_options() updates internal threads parameters from the
+/// corresponding UCI options and creates/destroys threads to match requested
+/// number. Thread objects are dynamically allocated.
void ThreadPool::read_uci_options() {
- maxThreadsPerSplitPoint = Options["Max Threads per Split Point"];
- minimumSplitDepth = Options["Min Split Depth"] * ONE_PLY;
- useSleepingThreads = Options["Use Sleeping Threads"];
- size_t requested = Options["Threads"];
+ size_t requested = Options["Threads"];
assert(requested > 0);
- while (threads.size() < requested)
- threads.push_back(new Thread(&Thread::idle_loop));
-
- while (threads.size() > requested)
- {
- delete threads.back();
- threads.pop_back();
- }
-}
-
-
-// available_slave_exists() tries to find an idle thread which is available as
-// a slave for the thread 'master'.
+ while (size() < requested)
+ push_back(new Thread);
-bool ThreadPool::available_slave_exists(Thread* master) const {
-
- for (size_t i = 0; i < threads.size(); i++)
- if (threads[i]->is_available_to(master))
- return true;
-
- return false;
+ while (size() > requested)
+ delete back(), pop_back();
}
-// split() does the actual work of distributing the work at a node between
-// several available threads. If it does not succeed in splitting the node
-// (because no idle threads are available, or because we have no unused split
-// point objects), the function immediately returns. If splitting is possible, a
-// SplitPoint object is initialized with all the data that must be copied to the
-// helper threads and then helper threads are told that they have been assigned
-// work. This will cause them to instantly leave their idle loops and call
-// search(). When all threads have returned from search() then split() returns.
-
-template
-Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
- Value bestValue, Move* bestMove, Depth depth, Move threatMove,
- int moveCount, MovePicker& mp, int nodeType) {
-
- assert(pos.pos_is_ok());
- assert(bestValue > -VALUE_INFINITE);
- assert(bestValue <= alpha);
- assert(alpha < beta);
- assert(beta <= VALUE_INFINITE);
- assert(depth > DEPTH_ZERO);
-
- Thread* master = pos.this_thread();
-
- if (master->splitPointsCnt >= MAX_SPLITPOINTS_PER_THREAD)
- return bestValue;
-
- // Pick the next available split point from the split point stack
- SplitPoint& sp = master->splitPoints[master->splitPointsCnt];
-
- sp.parent = master->curSplitPoint;
- sp.master = master;
- sp.cutoff = false;
- sp.slavesMask = 1ULL << master->idx;
- sp.depth = depth;
- sp.bestMove = *bestMove;
- sp.threatMove = threatMove;
- sp.alpha = alpha;
- sp.beta = beta;
- sp.nodeType = nodeType;
- sp.bestValue = bestValue;
- sp.mp = ∓
- sp.moveCount = moveCount;
- sp.pos = &pos;
- sp.nodes = 0;
- sp.ss = ss;
-
- assert(master->is_searching);
-
- master->curSplitPoint = &sp;
- int slavesCnt = 0;
-
- // Try to allocate available threads and ask them to start searching setting
- // is_searching flag. This must be done under lock protection to avoid concurrent
- // allocation of the same slave by another master.
- mutex.lock();
- sp.mutex.lock();
-
- for (size_t i = 0; i < threads.size() && !Fake; ++i)
- if (threads[i]->is_available_to(master))
- {
- sp.slavesMask |= 1ULL << i;
- threads[i]->curSplitPoint = &sp;
- threads[i]->is_searching = true; // Slave leaves idle_loop()
-
- if (useSleepingThreads)
- threads[i]->notify_one();
-
- if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
- break;
- }
-
- master->splitPointsCnt++;
-
- sp.mutex.unlock();
- mutex.unlock();
-
- // Everything is set up. The master thread enters the idle loop, from which
- // it will instantly launch a search, because its is_searching flag is set.
- // The thread will return from the idle loop when all slaves have finished
- // their work at this split point.
- if (slavesCnt || Fake)
- {
- master->idle_loop();
-
- // In helpful master concept a master can help only a sub-tree of its split
- // point, and because here is all finished is not possible master is booked.
- assert(!master->is_searching);
- }
+/// ThreadPool::nodes_searched() returns the number of nodes searched
- // We have returned from the idle loop, which means that all threads are
- // finished. Note that setting is_searching and decreasing splitPointsCnt is
- // done under lock protection to avoid a race with Thread::is_available_to().
- mutex.lock();
- sp.mutex.lock();
+int64_t ThreadPool::nodes_searched() {
- master->is_searching = true;
- master->splitPointsCnt--;
- master->curSplitPoint = sp.parent;
- pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
- *bestMove = sp.bestMove;
-
- sp.mutex.unlock();
- mutex.unlock();
-
- return sp.bestValue;
+ int64_t nodes = 0;
+ for (Thread* th : *this)
+ nodes += th->rootPos.nodes_searched();
+ return nodes;
}
-// Explicit template instantiations
-template Value ThreadPool::split(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
-template Value ThreadPool::split(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
+/// ThreadPool::start_thinking() wakes up the main thread sleeping in idle_loop()
+/// and starts a new search, then returns immediately.
-// wait_for_search_finished() waits for main thread to go to sleep, this means
-// search is finished. Then returns.
+void ThreadPool::start_thinking(Position& pos, StateListPtr& states,
+ const Search::LimitsType& limits) {
-void ThreadPool::wait_for_search_finished() {
+ main()->wait_for_search_finished();
- Thread* t = main_thread();
- t->mutex.lock();
- while (!t->do_sleep) sleepCondition.wait(t->mutex);
- t->mutex.unlock();
-}
+ Search::Signals.stopOnPonderhit = Search::Signals.stop = false;
+ Search::Limits = limits;
+ Search::RootMoves rootMoves;
+ for (const auto& m : MoveList(pos))
+ if ( limits.searchmoves.empty()
+ || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), m))
+ rootMoves.push_back(Search::RootMove(m));
-// start_searching() wakes up the main thread sleeping in main_loop() so to start
-// a new search, then returns immediately.
+ Tablebases::filter_root_moves(pos, rootMoves);
-void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
- const std::vector& searchMoves, StateStackPtr& states) {
- wait_for_search_finished();
+ // 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());
- SearchTime = Time::now(); // As early as possible
+ if (states.get())
+ setupStates = std::move(states); // Ownership transfer, states is now empty
- Signals.stopOnPonderhit = Signals.firstRootMove = false;
- Signals.stop = Signals.failedLowAtRoot = false;
+ StateInfo tmp = setupStates->back();
- RootPos = pos;
- Limits = limits;
- SetupStates = states; // Ownership transfer here
- RootMoves.clear();
+ for (Thread* th : Threads)
+ {
+ th->maxPly = 0;
+ th->rootDepth = DEPTH_ZERO;
+ th->rootMoves = rootMoves;
+ th->rootPos.set(pos.fen(), pos.is_chess960(), &setupStates->back(), th);
+ }
- for (MoveList ml(pos); !ml.end(); ++ml)
- if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
- RootMoves.push_back(RootMove(ml.move()));
+ setupStates->back() = tmp; // Restore st->previous, cleared by Position::set()
- main_thread()->do_sleep = false;
- main_thread()->notify_one();
+ main()->start_searching();
}