X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=4447efeecab4d911a1f0a7395c1d35d2df06c504;hp=b8686f4c48e5f69d0bed038ab9cab3bcfdf8cc18;hb=0c6ed5929cb875e1507569424ab13036c5214f9b;hpb=699f700162f410519e5510c667aebc9940d4e91e diff --git a/src/thread.cpp b/src/thread.cpp index b8686f4c..4447efee 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -27,22 +27,18 @@ using namespace Search; -ThreadsManager Threads; // Global object +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) { - - Threads.set_this_thread(th); // Save pointer into thread local storage - (th->*(th->start_fn))(); - return 0; - } + long start_routine(Thread* th) { (th->*(th->start_fn))(); return 0; } } } + // 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. @@ -59,7 +55,7 @@ Thread::Thread(Fn fn) { lock_init(sleepLock); cond_init(sleepCond); - for (int j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++) + for (size_t j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++) lock_init(splitPoints[j].lock); if (!thread_create(handle, start_routine, this)) @@ -183,7 +179,7 @@ bool Thread::cutoff_occurred() const { // 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(const Thread& master) const { +bool Thread::is_available_to(Thread* master) const { if (is_searching) return false; @@ -194,7 +190,7 @@ bool Thread::is_available_to(const Thread& master) const { // 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)); + return !spCnt || (splitPoints[spCnt - 1].slavesMask & (1ULL << master->idx)); } @@ -203,9 +199,8 @@ bool Thread::is_available_to(const Thread& master) const { // 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. -void ThreadsManager::init() { +void ThreadPool::init() { - tls_init(tlsKey); cond_init(sleepCond); lock_init(splitLock); timer = new Thread(&Thread::timer_loop); @@ -216,15 +211,14 @@ void ThreadsManager::init() { // d'tor cleanly terminates the threads when the program exits. -ThreadsManager::~ThreadsManager() { +ThreadPool::~ThreadPool() { - for (int i = 0; i < size(); i++) + for (size_t i = 0; i < size(); i++) delete threads[i]; delete timer; lock_destroy(splitLock); cond_destroy(sleepCond); - tls_destroy(tlsKey); } @@ -233,12 +227,12 @@ ThreadsManager::~ThreadsManager() { // objects are dynamically allocated to avoid creating in advance all possible // threads, with included pawns and material tables, if only few are used. -void ThreadsManager::read_uci_options() { +void ThreadPool::read_uci_options() { maxThreadsPerSplitPoint = Options["Max Threads per Split Point"]; minimumSplitDepth = Options["Min Split Depth"] * ONE_PLY; useSleepingThreads = Options["Use Sleeping Threads"]; - int requested = Options["Threads"]; + size_t requested = Options["Threads"]; assert(requested > 0); @@ -257,9 +251,9 @@ void ThreadsManager::read_uci_options() { // on the sleep condition and to reset maxPly. When useSleepingThreads is set // threads will be woken up at split time. -void ThreadsManager::wake_up() const { +void ThreadPool::wake_up() const { - for (int i = 0; i < size(); i++) + for (size_t i = 0; i < size(); i++) { threads[i]->maxPly = 0; threads[i]->do_sleep = false; @@ -273,9 +267,9 @@ void ThreadsManager::wake_up() const { // sleep() is called after the search finishes to ask all the threads but the // main one to go waiting on a sleep condition. -void ThreadsManager::sleep() const { +void ThreadPool::sleep() const { - for (int i = 1; i < size(); i++) // Main thread will go to sleep by itself + for (size_t i = 1; i < size(); i++) // Main thread will go to sleep by itself threads[i]->do_sleep = true; // to avoid a race with start_searching() } @@ -283,9 +277,9 @@ void ThreadsManager::sleep() const { // available_slave_exists() tries to find an idle thread which is available as // a slave for the thread 'master'. -bool ThreadsManager::available_slave_exists(const Thread& master) const { +bool ThreadPool::available_slave_exists(Thread* master) const { - for (int i = 0; i < size(); i++) + for (size_t i = 0; i < size(); i++) if (threads[i]->is_available_to(master)) return true; @@ -303,9 +297,10 @@ bool ThreadsManager::available_slave_exists(const Thread& master) const { // search(). When all threads have returned from search() then split() returns. template -Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, - Value bestValue, Move* bestMove, Depth depth, - Move threatMove, int moveCount, MovePicker* mp, int nodeType) { +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); @@ -313,18 +308,18 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, assert(beta <= VALUE_INFINITE); assert(depth > DEPTH_ZERO); - Thread& master = pos.this_thread(); + Thread* master = pos.this_thread(); - if (master.splitPointsCnt >= MAX_SPLITPOINTS_PER_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++]; + SplitPoint* sp = &master->splitPoints[master->splitPointsCnt]; - sp->parent = master.curSplitPoint; - sp->master = &master; + sp->parent = master->curSplitPoint; + sp->master = master; sp->cutoff = false; - sp->slavesMask = 1ULL << master.idx; + sp->slavesMask = 1ULL << master->idx; sp->depth = depth; sp->bestMove = *bestMove; sp->threatMove = threatMove; @@ -338,9 +333,9 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, sp->nodes = 0; sp->ss = ss; - assert(master.is_searching); + assert(master->is_searching); - master.curSplitPoint = sp; + master->curSplitPoint = sp; int slavesCnt = 0; // Try to allocate available threads and ask them to start searching setting @@ -349,7 +344,7 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, lock_grab(sp->lock); lock_grab(splitLock); - for (int i = 0; i < size() && !Fake; ++i) + for (size_t i = 0; i < size() && !Fake; ++i) if (threads[i]->is_available_to(master)) { sp->slavesMask |= 1ULL << i; @@ -363,21 +358,22 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, break; } + master->splitPointsCnt++; + lock_release(splitLock); lock_release(sp->lock); // 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. - // We pass the split point as a parameter to the idle loop, which means that - // the thread will return from the idle loop when all slaves have finished + // 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(sp); + 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); + assert(!master->is_searching); } // We have returned from the idle loop, which means that all threads are @@ -386,9 +382,9 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, lock_grab(sp->lock); // To protect sp->nodes lock_grab(splitLock); - master.is_searching = true; - master.splitPointsCnt--; - master.curSplitPoint = sp->parent; + master->is_searching = true; + master->splitPointsCnt--; + master->curSplitPoint = sp->parent; pos.set_nodes_searched(pos.nodes_searched() + sp->nodes); *bestMove = sp->bestMove; @@ -399,14 +395,14 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, } // Explicit template instantiations -template Value ThreadsManager::split(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker*, int); -template Value ThreadsManager::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); +template Value ThreadPool::split(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker*, int); -// ThreadsManager::set_timer() is used to set the timer to trigger after msec -// milliseconds. If msec is 0 then timer is stopped. +// set_timer() is used to set the timer to trigger after msec milliseconds. +// If msec is 0 then timer is stopped. -void ThreadsManager::set_timer(int msec) { +void ThreadPool::set_timer(int msec) { lock_grab(timer->sleepLock); timer->maxPly = msec; @@ -415,10 +411,10 @@ void ThreadsManager::set_timer(int msec) { } -// ThreadsManager::wait_for_search_finished() waits for main thread to go to -// sleep, this means search is finished. Then returns. +// wait_for_search_finished() waits for main thread to go to sleep, this means +// search is finished. Then returns. -void ThreadsManager::wait_for_search_finished() { +void ThreadPool::wait_for_search_finished() { Thread* t = main_thread(); lock_grab(t->sleepLock); @@ -428,10 +424,10 @@ void ThreadsManager::wait_for_search_finished() { } -// ThreadsManager::start_searching() wakes up the main thread sleeping in -// main_loop() so to start 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 ThreadsManager::start_searching(const Position& pos, const LimitsType& limits, +void ThreadPool::start_searching(const Position& pos, const LimitsType& limits, const std::vector& searchMoves) { wait_for_search_finished(); @@ -440,11 +436,11 @@ void ThreadsManager::start_searching(const Position& pos, const LimitsType& limi Signals.stopOnPonderhit = Signals.firstRootMove = false; Signals.stop = Signals.failedLowAtRoot = false; - RootPosition.copy(pos, main_thread()); + RootPosition = pos; Limits = limits; RootMoves.clear(); - for (MoveList ml(pos); !ml.end(); ++ml) + for (MoveList ml(pos); !ml.end(); ++ml) if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move())) RootMoves.push_back(RootMove(ml.move()));