X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.cpp;h=25ef1853c03755762db7645771ffdccfb599ff26;hb=4d46d29efe4ee496bda2aa7ea83184d502944852;hp=51b250273e58f55ead15dab783883eef4737a0f7;hpb=9a1d5f0f1d8a12a85b198688d4f1d636a146eb7a;p=stockfish diff --git a/src/thread.cpp b/src/thread.cpp index 51b25027..25ef1853 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -19,7 +19,6 @@ #include // For std::count #include -#include #include "movegen.h" #include "search.h" @@ -30,14 +29,32 @@ 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 the virtual function idle_loop(). - long start_routine(Thread* th) { th->idle_loop(); return 0; } + extern "C" { long start_routine(Thread* th) { th->idle_loop(); return 0; } } -} } + + // Helpers to launch a thread after creation and joining before delete. Must be + // outside Thread c'tor and d'tor because object shall be fully initialized + // when start_routine (and hence virtual idle_loop) is called and when joining. + + template T* new_thread() { + T* th = new T(); + thread_create(th->handle, start_routine, th); + return th; + } + + void delete_thread(Thread* th) { + th->exit = true; // Search must be already finished + th->notify_one(); + thread_join(th->handle); // Wait for thread termination + delete th; + } + +} // Thread c'tor starts a newly-created thread of execution that will call @@ -50,22 +67,6 @@ Thread::Thread() /* : splitPoints() */ { // Value-initialization bug in MSVC activeSplitPoint = NULL; activePosition = NULL; idx = Threads.size(); - - 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 - -Thread::~Thread() { - - exit = true; // Search must be already finished - notify_one(); - thread_join(handle); // Wait for thread termination } @@ -186,8 +187,8 @@ bool Thread::is_available_to(Thread* master) const { void ThreadPool::init() { sleepWhileIdle = true; - timer = new TimerThread(); - push_back(new MainThread()); + timer = new_thread(); + push_back(new_thread()); read_uci_options(); } @@ -196,10 +197,10 @@ void ThreadPool::init() { void ThreadPool::exit() { - delete timer; // As first because check_time() accesses threads data + delete_thread(timer); // As first because check_time() accesses threads data for (iterator it = begin(); it != end(); ++it) - delete *it; + delete_thread(*it); } @@ -217,11 +218,11 @@ void ThreadPool::read_uci_options() { assert(requested > 0); while (size() < requested) - push_back(new Thread()); + push_back(new_thread()); while (size() > requested) { - delete back(); + delete_thread(back()); pop_back(); } } @@ -252,7 +253,7 @@ Thread* ThreadPool::available_slave(Thread* master) const { template void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bestValue, Move* bestMove, Depth depth, Move threatMove, int moveCount, - MovePicker* movePicker, int nodeType) { + MovePicker* movePicker, int nodeType, bool cutNode) { assert(pos.pos_is_ok()); assert(*bestValue <= alpha && alpha < beta && beta <= VALUE_INFINITE); @@ -274,6 +275,7 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes sp.alpha = alpha; sp.beta = beta; sp.nodeType = nodeType; + sp.cutNode = cutNode; sp.movePicker = movePicker; sp.moveCount = moveCount; sp.pos = &pos; @@ -303,28 +305,28 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes slave->notify_one(); // Could be sleeping } - sp.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 '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 > 1 || Fake) { + sp.mutex.unlock(); + Threads.mutex.unlock(); + 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(!searching); assert(!activePosition); - } - // We have returned from the idle loop, which means that all threads are - // finished. Note that setting 'searching' and decreasing splitPointsSize is - // done under lock protection to avoid a race with Thread::is_available_to(). - Threads.mutex.lock(); - sp.mutex.lock(); + // We have returned from the idle loop, which means that all threads are + // finished. Note that setting 'searching' and decreasing splitPointsSize is + // done under lock protection to avoid a race with Thread::is_available_to(). + Threads.mutex.lock(); + sp.mutex.lock(); + } searching = true; splitPointsSize--; @@ -339,8 +341,8 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes } // Explicit template instantiations -template void Thread::split(Position&, Stack*, Value, Value, Value*, Move*, Depth, Move, int, MovePicker*, int); -template void Thread::split< true>(Position&, Stack*, Value, Value, Value*, Move*, Depth, Move, int, MovePicker*, int); +template void Thread::split(Position&, Stack*, Value, Value, Value*, Move*, Depth, Move, int, MovePicker*, int, bool); +template void Thread::split< true>(Position&, Stack*, Value, Value, Value*, Move*, Depth, Move, int, MovePicker*, int, bool); // wait_for_think_finished() waits for main thread to go to sleep then returns @@ -366,15 +368,19 @@ void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits, Signals.stopOnPonderhit = Signals.firstRootMove = false; Signals.stop = Signals.failedLowAtRoot = false; + RootMoves.clear(); 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 = states; // Ownership transfer here + assert(!states.get()); + } - for (MoveList ml(pos); !ml.end(); ++ml) + for (MoveList it(pos); *it; ++it) if ( searchMoves.empty() - || std::count(searchMoves.begin(), searchMoves.end(), ml.move())) - RootMoves.push_back(RootMove(ml.move())); + || std::count(searchMoves.begin(), searchMoves.end(), *it)) + RootMoves.push_back(RootMove(*it)); main_thread()->thinking = true; main_thread()->notify_one(); // Starts main thread