along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <algorithm> // For std::count
#include <cassert>
#include <iostream>
Thread::Thread() : splitPoints() {
- is_searching = do_exit = false;
- maxPly = splitPointsCnt = 0;
- curSplitPoint = NULL;
+ searching = exit = false;
+ maxPly = splitPointsSize = 0;
+ activeSplitPoint = NULL;
idx = Threads.size();
if (!thread_create(handle, start_routine, this))
Thread::~Thread() {
- do_exit = true; // Search must be already finished
+ exit = true; // Search must be already finished
notify_one();
thread_join(handle); // Wait for thread termination
}
void TimerThread::idle_loop() {
- while (!do_exit)
+ while (!exit)
{
mutex.lock();
- do sleepCondition.wait_for(mutex, msec ? msec : INT_MAX);
- while (!msec && !do_exit); // Don't allow wakeups when msec = 0
+
+ if (!exit)
+ sleepCondition.wait_for(mutex, msec ? msec : INT_MAX);
+
mutex.unlock();
- check_time();
+ if (msec)
+ check_time();
}
}
{
mutex.lock();
- is_finished = true; // Always return to sleep after a search
- is_searching = false;
+ thinking = false;
- while (is_finished && !do_exit)
+ while (!thinking && !exit)
{
Threads.sleepCondition.notify_one(); // Wake up UI thread if needed
sleepCondition.wait(mutex);
mutex.unlock();
- if (do_exit)
+ if (exit)
return;
- is_searching = true;
+ searching = true;
Search::think();
- assert(is_searching);
+ assert(searching);
+
+ searching = false;
}
}
-// Thread::notify_one() wakes up the thread, normally at split time
+// Thread::notify_one() wakes up the thread when there is some search to do
void Thread::notify_one() {
bool Thread::cutoff_occurred() const {
- for (SplitPoint* sp = curSplitPoint; sp; sp = sp->parent)
+ for (SplitPoint* sp = activeSplitPoint; sp; sp = sp->parentSplitPoint)
if (sp->cutoff)
return true;
// 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).
+// the master of some 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).
bool Thread::is_available_to(Thread* master) const {
- if (is_searching)
+ if (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;
+ int size = splitPointsSize;
- // No active split points means that the thread is available as a slave for any
+ // No 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));
+ return !size || (splitPoints[size - 1].slavesMask & (1ULL << master->idx));
}
-// init() is called at startup. Initializes lock and condition variable and
-// launches requested threads sending them immediately to sleep. We cannot use
+// init() is called at startup to create and launch requested threads, that will
+// go immediately to sleep due to 'sleepWhileIdle' set to true. 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.
+// engine at this point due to allocation of Endgames in Thread c'tor.
void ThreadPool::init() {
sleepWhileIdle = true;
timer = new TimerThread();
- threads.push_back(new MainThread());
+ push_back(new MainThread());
read_uci_options();
}
-// exit() cleanly terminates the threads before the program exits.
+// exit() cleanly terminates the threads before the program exits
void ThreadPool::exit() {
- delete timer; // As first becuase check_time() accesses threads data
+ delete timer; // As first because check_time() accesses threads data
- for (size_t i = 0; i < threads.size(); i++)
- delete threads[i];
+ for (iterator it = begin(); it != end(); ++it)
+ delete *it;
}
assert(requested > 0);
- while (threads.size() < requested)
- threads.push_back(new Thread());
+ while (size() < requested)
+ push_back(new Thread());
- while (threads.size() > requested)
+ while (size() > requested)
{
- delete threads.back();
- threads.pop_back();
+ delete back();
+ pop_back();
}
}
-// available_slave_exists() tries to find an idle thread which is available as
-// a slave for the thread 'master'.
+// slave_available() tries to find an idle thread which is available as a slave
+// for the thread 'master'.
-bool ThreadPool::available_slave_exists(Thread* master) const {
+bool ThreadPool::slave_available(Thread* master) const {
- for (size_t i = 0; i < threads.size(); i++)
- if (threads[i]->is_available_to(master))
+ for (const_iterator it = begin(); it != end(); ++it)
+ if ((*it)->is_available_to(master))
return true;
return false;
// 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.
+// (because no idle threads are available), 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 <bool Fake>
-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) {
+Value Thread::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 <= alpha && alpha < beta && beta <= VALUE_INFINITE);
assert(bestValue > -VALUE_INFINITE);
- assert(bestValue <= alpha);
- assert(alpha < beta);
- assert(beta <= VALUE_INFINITE);
- assert(depth > DEPTH_ZERO);
+ assert(depth >= Threads.minimumSplitDepth);
- Thread* master = pos.this_thread();
-
- if (master->splitPointsCnt >= MAX_SPLITPOINTS_PER_THREAD)
- return bestValue;
+ assert(searching);
+ assert(splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);
// Pick the next available split point from the split point stack
- SplitPoint& sp = master->splitPoints[master->splitPointsCnt];
+ SplitPoint& sp = splitPoints[splitPointsSize];
- sp.parent = master->curSplitPoint;
- sp.master = master;
- sp.cutoff = false;
- sp.slavesMask = 1ULL << master->idx;
+ sp.masterThread = this;
+ sp.parentSplitPoint = activeSplitPoint;
+ sp.slavesMask = 1ULL << idx;
sp.depth = depth;
sp.bestMove = *bestMove;
sp.threatMove = threatMove;
sp.beta = beta;
sp.nodeType = nodeType;
sp.bestValue = bestValue;
- sp.mp = ∓
+ sp.movePicker = ∓
sp.moveCount = moveCount;
sp.pos = &pos;
sp.nodes = 0;
+ sp.cutoff = false;
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
+ // 'searching' flag. This must be done under lock protection to avoid concurrent
// allocation of the same slave by another master.
- mutex.lock();
+ Threads.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()
- threads[i]->notify_one(); // Could be sleeping
+ splitPointsSize++;
+ activeSplitPoint = &sp;
- if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
- break;
- }
+ size_t slavesCnt = 1; // This thread is always included
- master->splitPointsCnt++;
+ for (ThreadPool::iterator it = Threads.begin(); it != Threads.end() && !Fake; ++it)
+ {
+ Thread* slave = *it;
+
+ if (slave->is_available_to(this) && ++slavesCnt <= Threads.maxThreadsPerSplitPoint)
+ {
+ sp.slavesMask |= 1ULL << slave->idx;
+ slave->activeSplitPoint = &sp;
+ slave->searching = true; // Slave leaves idle_loop()
+ slave->notify_one(); // Could be sleeping
+ }
+ }
sp.mutex.unlock();
- mutex.unlock();
+ Threads.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.
+ // it will instantly launch a search, because its '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)
+ if (slavesCnt > 1 || Fake)
{
- master->Thread::idle_loop(); // Force a call to base class idle_loop()
+ Thread::idle_loop(); // Force a call to base class 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);
+ assert(!searching);
}
// We have returned from the idle loop, which means that all threads are
- // finished. Note that setting is_searching and decreasing splitPointsCnt is
+ // finished. Note that setting 'searching' and decreasing splitPointsSize is
// done under lock protection to avoid a race with Thread::is_available_to().
- mutex.lock();
+ Threads.mutex.lock();
sp.mutex.lock();
- master->is_searching = true;
- master->splitPointsCnt--;
- master->curSplitPoint = sp.parent;
+ searching = true;
+ splitPointsSize--;
+ activeSplitPoint = sp.parentSplitPoint;
pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
*bestMove = sp.bestMove;
sp.mutex.unlock();
- mutex.unlock();
+ Threads.mutex.unlock();
return sp.bestValue;
}
// Explicit template instantiations
-template Value ThreadPool::split<false>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
-template Value ThreadPool::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
+template Value Thread::split<false>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
+template Value Thread::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
-// wait_for_search_finished() waits for main thread to go to sleep, this means
-// search is finished. Then returns.
+// wait_for_think_finished() waits for main thread to go to sleep then returns
-void ThreadPool::wait_for_search_finished() {
+void ThreadPool::wait_for_think_finished() {
MainThread* t = main_thread();
t->mutex.lock();
- while (!t->is_finished) sleepCondition.wait(t->mutex);
+ while (t->thinking) sleepCondition.wait(t->mutex);
t->mutex.unlock();
}
-// start_searching() wakes up the main thread sleeping in main_loop() so to start
-// a new search, then returns immediately.
+// start_thinking() wakes up the main thread sleeping in MainThread::idle_loop()
+// so to start a new search, then returns immediately.
-void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
- const std::vector<Move>& searchMoves, StateStackPtr& states) {
- wait_for_search_finished();
+void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
+ const std::vector<Move>& searchMoves, StateStackPtr& states) {
+ wait_for_think_finished();
SearchTime = Time::now(); // As early as possible
RootMoves.clear();
for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)
- if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
+ if ( searchMoves.empty()
+ || std::count(searchMoves.begin(), searchMoves.end(), ml.move()))
RootMoves.push_back(RootMove(ml.move()));
- main_thread()->is_finished = false;
+ main_thread()->thinking = true;
main_thread()->notify_one(); // Starts main thread
}
projects / stockfish / blobdiff