X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fthread.cpp;h=9f5a13f8624dac701d3827ee0d2beefca76e8cf4;hb=b978eb05dcce5eb874bb45e30af854d332b9738f;hp=358ced5dec3bf26eb823af4bd82ad8041801ca89;hpb=2ef5b4066e649c6ce3b10aa5f1bff7525246646d;p=stockfish diff --git a/src/thread.cpp b/src/thread.cpp index 358ced5d..9f5a13f8 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -32,31 +32,56 @@ ThreadsManager Threads; // Global object namespace { extern "C" { // start_routine() is the C function which is called when a new thread - // is launched. It simply calls idle_loop() of the supplied thread. The first - // and last thread are special. First one is the main search thread while the - // last one mimics a timer, they run in main_loop() and timer_loop(). + // is launched. It is a wrapper to member function pointed by start_fn -#if defined(_WIN32) || defined(_WIN64) - DWORD WINAPI start_routine(LPVOID thread) { -#else - void* start_routine(void* thread) { -#endif + long start_routine(Thread* th) { (th->*(th->start_fn))(); return 0; } - Thread* th = (Thread*)thread; +} } + + +// 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. - if (th->threadID == 0) - th->main_loop(); +Thread::Thread(Fn fn) { - else if (th->threadID == MAX_THREADS) - th->timer_loop(); + is_searching = do_exit = false; + maxPly = splitPointsCnt = 0; + curSplitPoint = NULL; + start_fn = fn; + threadID = Threads.size(); + do_sleep = (threadID != 0); // Avoid a race with start_thinking() - else - th->idle_loop(NULL); + lock_init(sleepLock); + cond_init(sleepCond); + + for (int j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++) + lock_init(splitPoints[j].lock); - return 0; + if (!thread_create(handle, start_routine, this)) + { + std::cerr << "Failed to create thread number " << threadID << std::endl; + ::exit(EXIT_FAILURE); } +} -} } + +// Thread d'tor will wait for thread termination before to return. + +Thread::~Thread() { + + assert(do_sleep); + + do_exit = true; // Search must be already finished + wake_up(); + + thread_join(handle); // Wait for thread termination + + lock_destroy(sleepLock); + cond_destroy(sleepCond); + + for (int j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++) + lock_destroy(splitPoints[j].lock); +} // Thread::timer_loop() is where the timer thread waits maxPly milliseconds and @@ -172,104 +197,78 @@ bool Thread::is_available_to(int master) const { // read_uci_options() updates internal threads parameters from the corresponding -// UCI options. It is called before to start a new search. +// 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 ThreadsManager::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"]; + assert(requested > 0); -// set_size() changes the number of active threads and raises do_sleep flag for -// all the unused threads that will go immediately to sleep. - -void ThreadsManager::set_size(int cnt) { - - assert(cnt > 0 && cnt < MAX_THREADS); - - activeThreads = cnt; - - for (int i = 0; i < MAX_THREADS; i++) - if (i < activeThreads) - { - // Dynamically allocate pawn and material hash tables according to the - // number of active threads. This avoids preallocating memory for all - // possible threads if only few are used. - threads[i].pawnTable.init(); - threads[i].materialTable.init(); - threads[i].maxPly = 0; - - threads[i].do_sleep = false; + while (size() < requested) + threads.push_back(new Thread(&Thread::idle_loop)); - if (!useSleepingThreads) - threads[i].wake_up(); - } - else - threads[i].do_sleep = true; + while (size() > requested) + { + delete threads.back(); + threads.pop_back(); + } } -// init() is called during startup. Initializes locks and condition variables -// and launches all threads sending them immediately to sleep. - -void ThreadsManager::init() { - - read_uci_options(); +// wake_up() is called before a new search to start the threads that are waiting +// on the sleep condition. If useSleepingThreads is set threads will be woken up +// at split time. - cond_init(sleepCond); - lock_init(splitLock); +void ThreadsManager::wake_up() { - for (int i = 0; i <= MAX_THREADS; i++) + for (int i = 0; i < size(); i++) { - lock_init(threads[i].sleepLock); - cond_init(threads[i].sleepCond); + threads[i]->do_sleep = false; + threads[i]->maxPly = 0; - for (int j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++) - lock_init(threads[i].splitPoints[j].lock); + if (!useSleepingThreads) + threads[i]->wake_up(); } +} - // Allocate main thread tables to call evaluate() also when not searching - threads[0].pawnTable.init(); - threads[0].materialTable.init(); - // Create and launch all the threads, threads will go immediately to sleep - for (int i = 0; i <= MAX_THREADS; i++) - { - threads[i].is_searching = false; - threads[i].do_sleep = (i != 0); // Avoid a race with start_thinking() - threads[i].threadID = i; +// sleep() is called after the search to ask all the threads but the main to go +// waiting on a sleep condition. - if (!thread_create(threads[i].handle, start_routine, threads[i])) - { - std::cerr << "Failed to create thread number " << i << std::endl; - ::exit(EXIT_FAILURE); - } - } +void ThreadsManager::sleep() { + + 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_thinking() } -// exit() is called to cleanly terminate the threads when the program finishes +// init() is called during startup. Initializes locks and condition variables +// and launches all threads sending them immediately to sleep. -void ThreadsManager::exit() { +void ThreadsManager::init() { - for (int i = 0; i <= MAX_THREADS; i++) - { - assert(threads[i].do_sleep); + cond_init(sleepCond); + lock_init(splitLock); + timer = new Thread(&Thread::timer_loop); + threads.push_back(new Thread(&Thread::main_loop)); + read_uci_options(); +} - threads[i].do_exit = true; // Search must be already finished - threads[i].wake_up(); - thread_join(threads[i].handle); // Wait for thread termination +// exit() is called to cleanly terminate the threads before the program finishes - lock_destroy(threads[i].sleepLock); - cond_destroy(threads[i].sleepCond); +void ThreadsManager::exit() { - for (int j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++) - lock_destroy(threads[i].splitPoints[j].lock); - } + for (int i = 0; i < size(); i++) + delete threads[i]; + delete timer; lock_destroy(splitLock); cond_destroy(sleepCond); } @@ -280,10 +279,10 @@ void ThreadsManager::exit() { bool ThreadsManager::available_slave_exists(int master) const { - assert(master >= 0 && master < activeThreads); + assert(master >= 0 && master < size()); - for (int i = 0; i < activeThreads; i++) - if (threads[i].is_available_to(master)) + for (int i = 0; i < size(); i++) + if (threads[i]->is_available_to(master)) return true; return false; @@ -302,18 +301,16 @@ bool ThreadsManager::available_slave_exists(int master) const { 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) { + 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); - assert(pos.thread() >= 0 && pos.thread() < activeThreads); - assert(activeThreads > 1); int master = pos.thread(); - Thread& masterThread = threads[master]; + Thread& masterThread = *threads[master]; if (masterThread.splitPointsCnt >= MAX_SPLITPOINTS_PER_THREAD) return bestValue; @@ -349,15 +346,15 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, lock_grab(sp->lock); lock_grab(splitLock); - for (int i = 0; i < activeThreads && !Fake; i++) - if (threads[i].is_available_to(master)) + for (int i = 0; i < 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]->curSplitPoint = sp; + threads[i]->is_searching = true; // Slave leaves idle_loop() if (useSleepingThreads) - threads[i].wake_up(); + threads[i]->wake_up(); if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included break; @@ -408,12 +405,10 @@ template Value ThreadsManager::split(Position&, Stack*, Value, Value, Valu void ThreadsManager::set_timer(int msec) { - Thread& timer = threads[MAX_THREADS]; - - lock_grab(timer.sleepLock); - timer.maxPly = msec; - cond_signal(timer.sleepCond); // Wake up and restart the timer - lock_release(timer.sleepLock); + lock_grab(timer->sleepLock); + timer->maxPly = msec; + cond_signal(timer->sleepCond); // Wake up and restart the timer + lock_release(timer->sleepLock); } @@ -424,7 +419,7 @@ void ThreadsManager::set_timer(int msec) { void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limits, const std::set& searchMoves, bool async) { - Thread& main = threads[0]; + Thread& main = *threads.front(); lock_grab(main.sleepLock); @@ -464,7 +459,7 @@ void ThreadsManager::start_thinking(const Position& pos, const LimitsType& limit void ThreadsManager::stop_thinking() { - Thread& main = threads[0]; + Thread& main = *threads.front(); Search::Signals.stop = true;