X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.cpp;h=34424d3791c7b30fdabab421b93c506c93f285a0;hb=27c5cb59127101d834636d4faa0062d4e7bd05ce;hp=271890c6f008b85eedee8d2302f0ebe4f2353e57;hpb=ed0fb0b05fa72ccc6333bf5331eb9abeb7c86457;p=stockfish
diff --git a/src/thread.cpp b/src/thread.cpp
index 271890c6..34424d37 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -1,7 +1,7 @@
/*
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
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,420 +17,242 @@
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"
+#include "uci.h"
using namespace Search;
ThreadPool Threads; // Global object
-namespace { extern "C" {
+namespace {
- // 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.
+ // Helpers to launch a thread after creation and joining before delete. Outside the
+ // Thread constructor and destructor because the object must be fully initialized
+ // when start_routine (and hence virtual idle_loop) is called and when joining.
- long start_routine(Thread* th) { (th->*(th->start_fn))(); return 0; }
+ template T* new_thread() {
+ std::thread* th = new T;
+ *th = std::thread(&T::idle_loop, (T*)th); // Will go to sleep
+ return (T*)th;
+ }
-} }
+ void delete_thread(ThreadBase* th) {
+ th->mutex.lock();
+ th->exit = true; // Search must be already finished
+ th->mutex.unlock();
-// 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.
+ th->notify_one();
+ th->join(); // Wait for thread termination
+ delete th;
+ }
-Thread::Thread(Fn fn) : splitPoints() {
-
- 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);
- }
}
-// Thread d'tor waits for thread termination before to return.
+// ThreadBase::notify_one() wakes up the thread when there is some work to do
-Thread::~Thread() {
+void ThreadBase::notify_one() {
- assert(do_sleep);
-
- do_exit = true; // Search must be already finished
- wake_up();
- thread_join(handle); // Wait for thread termination
+ std::unique_lock lk(mutex);
+ sleepCondition.notify_one();
}
-// 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();
+// ThreadBase::wait() set the thread to sleep until 'condition' turns true
-void Thread::timer_loop() {
+void ThreadBase::wait(std::atomic& condition) {
- while (!do_exit)
- {
- mutex.lock();
- sleepCondition.wait_for(mutex, maxPly ? maxPly : INT_MAX);
- mutex.unlock();
- check_time();
- }
+ std::unique_lock lk(mutex);
+ sleepCondition.wait(lk, [&]{ return bool(condition); });
}
-// 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();
-
- if (do_exit)
- return;
-
- is_searching = true;
+// ThreadBase::wait_while() set the thread to sleep until 'condition' turns false
+void ThreadBase::wait_while(std::atomic& condition) {
- Search::think();
-
- assert(is_searching);
- }
+ std::unique_lock lk(mutex);
+ sleepCondition.wait(lk, [&]{ return !condition; });
}
-// Thread::wake_up() wakes up the thread, normally at the beginning of the search
-// or, if "sleeping threads" is used at split time.
+// Thread constructor makes some init but does not launch any execution thread,
+// which will be started only when the constructor returns.
-void Thread::wake_up() {
+Thread::Thread() {
- mutex.lock();
- sleepCondition.notify_one();
- mutex.unlock();
+ searching = false;
+ maxPly = 0;
+ history.clear();
+ counterMoves.clear();
+ idx = Threads.size(); // Starts from 0
}
-// Thread::wait_for_stop_or_ponderhit() is called when the maximum depth is
-// reached while the program is pondering. The point is to work around a wrinkle
-// in the UCI protocol: When pondering, the engine is not allowed to give a
-// "bestmove" before the GUI sends it a "stop" or "ponderhit" command. We simply
-// wait here until one of these commands (that raise StopRequest) is sent and
-// then return, after which the bestmove and pondermove will be printed.
+// TimerThread::idle_loop() is where the timer thread waits Resolution milliseconds
+// and then calls check_time(). When not searching, thread sleeps until it's woken up.
-void Thread::wait_for_stop_or_ponderhit() {
+void TimerThread::idle_loop() {
- Signals.stopOnPonderhit = true;
-
- mutex.lock();
- while (!Signals.stop) sleepCondition.wait(mutex);;
- mutex.unlock();
-}
-
-
-// Thread::cutoff_occurred() checks whether a beta cutoff has occurred in the
-// current active split point, or in some ancestor of the split point.
+ while (!exit)
+ {
+ std::unique_lock lk(mutex);
-bool Thread::cutoff_occurred() const {
+ if (!exit)
+ sleepCondition.wait_for(lk, std::chrono::milliseconds(run ? Resolution : INT_MAX));
- for (SplitPoint* sp = curSplitPoint; sp; sp = sp->parent)
- if (sp->cutoff)
- return true;
+ lk.unlock();
- return false;
+ if (!exit && run)
+ check_time();
+ }
}
-// 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).
+// Thread::idle_loop() is where the thread is parked when it has no work to do
-bool Thread::is_available_to(Thread* master) const {
+void Thread::idle_loop() {
- if (is_searching)
- return false;
-
- // 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;
-
- // 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));
-}
+ while (!exit)
+ {
+ std::unique_lock lk(mutex);
+ while (!searching && !exit)
+ sleepCondition.wait(lk);
-// 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.
+ lk.unlock();
-void ThreadPool::init() {
-
- timer = new Thread(&Thread::timer_loop);
- threads.push_back(new Thread(&Thread::main_loop));
- read_uci_options();
+ if (!exit && searching)
+ search();
+ }
}
-// exit() cleanly terminates the threads before the program exits.
+// MainThread::idle_loop() is where the main thread is parked waiting to be started
+// when there is a new search. The main thread will launch all the slave threads.
-void ThreadPool::exit() {
+void MainThread::idle_loop() {
- delete timer; // As first becuase check_time() accesses threads data
-
- for (size_t i = 0; i < threads.size(); i++)
- delete threads[i];
-}
-
-
-// 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.
-
-void ThreadPool::read_uci_options() {
+ while (!exit)
+ {
+ std::unique_lock lk(mutex);
- maxThreadsPerSplitPoint = Options["Max Threads per Split Point"];
- minimumSplitDepth = Options["Min Split Depth"] * ONE_PLY;
- useSleepingThreads = Options["Use Sleeping Threads"];
- size_t requested = Options["Threads"];
+ thinking = false;
- assert(requested > 0);
+ while (!thinking && !exit)
+ {
+ sleepCondition.notify_one(); // Wake up the UI thread if needed
+ sleepCondition.wait(lk);
+ }
- while (threads.size() < requested)
- threads.push_back(new Thread(&Thread::idle_loop));
+ lk.unlock();
- while (threads.size() > requested)
- {
- delete threads.back();
- threads.pop_back();
+ if (!exit)
+ think();
}
}
-// wake_up() is called before a new search to start the threads that are waiting
-// on the sleep condition and to reset maxPly. When useSleepingThreads is set
-// threads will be woken up at split time.
+// MainThread::join() waits for main thread to finish thinking
-void ThreadPool::wake_up() const {
+void MainThread::join() {
- for (size_t i = 0; i < threads.size(); i++)
- {
- threads[i]->maxPly = 0;
- threads[i]->do_sleep = false;
-
- if (!useSleepingThreads)
- threads[i]->wake_up();
- }
+ std::unique_lock lk(mutex);
+ sleepCondition.wait(lk, [&]{ return !thinking; });
}
-// sleep() is called after the search finishes to ask all the threads but the
-// main one to go waiting on a sleep condition.
+// ThreadPool::init() is called at startup to create and launch 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::sleep() const {
+void ThreadPool::init() {
- // Main thread will go to sleep by itself to avoid a race with start_searching()
- for (size_t i = 1; i < threads.size(); i++)
- threads[i]->do_sleep = true;
+ timer = new_thread();
+ push_back(new_thread());
+ read_uci_options();
}
-// available_slave_exists() tries to find an idle thread which is available as
-// a slave for the thread 'master'.
+// ThreadPool::exit() terminates the threads before the program exits. Cannot be
+// done in destructor because threads must be terminated before freeing us.
+
+void ThreadPool::exit() {
-bool ThreadPool::available_slave_exists(Thread* master) const {
+ delete_thread(timer); // As first because check_time() accesses threads data
+ timer = nullptr;
- for (size_t i = 0; i < threads.size(); i++)
- if (threads[i]->is_available_to(master))
- return true;
+ for (Thread* th : *this)
+ delete_thread(th);
- return false;
+ clear(); // Get rid of stale pointers
}
-// 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 = 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()
+// ThreadPool::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 all possible
+// threads in advance (which include pawns and material tables), even if only a
+// few are to be used.
- if (useSleepingThreads)
- threads[i]->wake_up();
+void ThreadPool::read_uci_options() {
- if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
- break;
- }
+ size_t requested = Options["Threads"];
- master->splitPointsCnt++;
+ assert(requested > 0);
- sp.mutex.unlock();
- mutex.unlock();
+ while (size() < requested)
+ push_back(new_thread());
- // 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)
+ while (size() > requested)
{
- 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);
+ delete_thread(back());
+ pop_back();
}
-
- // 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();
-
- 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;
}
-// 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::nodes_searched() returns the number of nodes searched
-// set_timer() is used to set the timer to trigger after msec milliseconds.
-// If msec is 0 then timer is stopped.
+int64_t ThreadPool::nodes_searched() {
-void ThreadPool::set_timer(int msec) {
-
- timer->mutex.lock();
- timer->maxPly = msec;
- timer->sleepCondition.notify_one(); // Wake up and restart the timer
- timer->mutex.unlock();
+ int64_t nodes = 0;
+ for (Thread *th : *this)
+ nodes += th->rootPos.nodes_searched();
+ return nodes;
}
-// wait_for_search_finished() waits for main thread to go to sleep, this means
-// search is finished. Then returns.
-
-void ThreadPool::wait_for_search_finished() {
-
- Thread* t = main_thread();
- t->mutex.lock();
- t->sleepCondition.notify_one(); // In case is waiting for stop or ponderhit
- while (!t->do_sleep) sleepCondition.wait(t->mutex);
- t->mutex.unlock();
-}
-
+// ThreadPool::start_thinking() wakes up the main thread sleeping in
+// MainThread::idle_loop() and starts a new search, then returns immediately.
-// start_searching() wakes up the main thread sleeping in main_loop() so to start
-// a new search, then returns immediately.
-
-void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
- const std::vector& searchMoves, StateStackPtr& states) {
- wait_for_search_finished();
-
- SearchTime = Time::now(); // As early as possible
+void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
+ StateStackPtr& states) {
+ main()->join();
Signals.stopOnPonderhit = Signals.firstRootMove = false;
Signals.stop = Signals.failedLowAtRoot = false;
- RootPosition = pos;
+ main()->rootMoves.clear();
+ main()->rootPos = pos;
Limits = limits;
- SetupStates = states; // Ownership transfer here
- RootMoves.clear();
+ if (states.get()) // If we don't set a new position, preserve current state
+ {
+ SetupStates = std::move(states); // Ownership transfer here
+ assert(!states.get());
+ }
- for (MoveList ml(pos); !ml.end(); ++ml)
- if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
- RootMoves.push_back(RootMove(ml.move()));
+ for (const auto& m : MoveList(pos))
+ if ( limits.searchmoves.empty()
+ || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), m))
+ main()->rootMoves.push_back(RootMove(m));
- main_thread()->do_sleep = false;
- main_thread()->wake_up();
+ main()->thinking = true;
+ main()->notify_one(); // Wake up main thread: 'thinking' must be already set
}