X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=ae0fa1ceddd33779ddc333e58748f5ad3a13779c;hp=7b9a4f327823a4e0e60bcf9492d972ea0ccaa16d;hb=960a689769cb143afa364d3669940c18d0c3a503;hpb=b1f57e92cea7bd36126ef8c26928d8991b74baef diff --git a/src/thread.cpp b/src/thread.cpp index 7b9a4f32..ae0fa1ce 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -27,23 +27,18 @@ using namespace Search; -ThreadsManager Threads; // Global object -THREAD_LOCAL Thread* this_thread; // Thread local variable +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) { - - 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. @@ -204,20 +199,19 @@ bool Thread::is_available_to(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() { cond_init(sleepCond); lock_init(splitLock); timer = new Thread(&Thread::timer_loop); threads.push_back(new Thread(&Thread::main_loop)); - this_thread = main_thread(); // Use main thread's resources read_uci_options(); } // d'tor cleanly terminates the threads when the program exits. -ThreadsManager::~ThreadsManager() { +ThreadPool::~ThreadPool() { for (int i = 0; i < size(); i++) delete threads[i]; @@ -233,7 +227,7 @@ 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; @@ -257,7 +251,7 @@ 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++) { @@ -273,7 +267,7 @@ 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 threads[i]->do_sleep = true; // to avoid a race with start_searching() @@ -283,7 +277,7 @@ 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(Thread* master) const { +bool ThreadPool::available_slave_exists(Thread* master) const { for (int i = 0; i < size(); i++) if (threads[i]->is_available_to(master)) @@ -303,9 +297,10 @@ bool ThreadsManager::available_slave_exists(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,13 +308,13 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, assert(beta <= VALUE_INFINITE); assert(depth > DEPTH_ZERO); - Thread* master = this_thread; + 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++]; + SplitPoint* sp = &master->splitPoints[master->splitPointsCnt]; sp->parent = master->curSplitPoint; sp->master = master; @@ -363,6 +358,8 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, break; } + master->splitPointsCnt++; + lock_release(splitLock); lock_release(sp->lock); @@ -399,14 +396,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 +412,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 +425,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();