X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=f5bd50ea5cfa28ec157d3082ba440058c51189e5;hp=e1330396d0007f30815c3ba95d2142c9ad8bb1d7;hb=4a71c862702c05b3c56e902f4675fdf68041710b;hpb=5b35c149e833e365c2afb8039ca5c658abc53081 diff --git a/src/thread.cpp b/src/thread.cpp index e1330396..f5bd50ea 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -281,49 +281,41 @@ Value ThreadsManager::split(Position& pos, SearchStack* ss, Value alpha, Value b // If we are here it means we are not available assert(masterThread.state == Thread::SEARCHING); - int booked = 0; + int workersCnt = 1; // At least the master is included - // Try to allocate available threads setting state to Thread::BOOKED, this - // must be done under lock protection to avoid concurrent allocation of - // the same slave by another master. + // Try to allocate available threads and ask them to start searching setting + // the state to Thread::WORKISWAITING, this must be done under lock protection + // to avoid concurrent allocation of the same slave by another master. lock_grab(&threadsLock); - for (i = 0; !Fake && i < activeThreads && booked < maxThreadsPerSplitPoint; i++) + for (i = 0; !Fake && i < activeThreads && workersCnt < maxThreadsPerSplitPoint; i++) if (i != master && threads[i].is_available_to(master)) { - threads[i].state = Thread::BOOKED; - threads[i].splitPoint = &splitPoint; + workersCnt++; splitPoint.is_slave[i] = true; - booked++; + threads[i].splitPoint = &splitPoint; + + // This makes the slave to exit from idle_loop() + threads[i].state = Thread::WORKISWAITING; + + if (useSleepingThreads) + threads[i].wake_up(); } lock_release(&threadsLock); // We failed to allocate even one slave, return - if (!Fake && !booked) + if (!Fake && workersCnt == 1) return bestValue; - masterThread.activeSplitPoints++; masterThread.splitPoint = &splitPoint; - - // Tell the threads that they have some work to do. This will make them leave - // their idle loop. - for (i = 0; i < activeThreads; i++) - if (i == master || splitPoint.is_slave[i]) - { - assert(i == master || threads[i].state == Thread::BOOKED); - - // This makes the slave to exit from idle_loop() - threads[i].state = Thread::WORKISWAITING; - - if (useSleepingThreads && i != master) - threads[i].wake_up(); - } + masterThread.activeSplitPoints++; + masterThread.state = Thread::WORKISWAITING; // Everything is set up. The master thread enters the idle loop, from // which it will instantly launch a search, because its state is - // THREAD_WORKISWAITING. We send the split point as a second parameter to the - // idle loop, which means that the main thread will return from the idle + // Thread::WORKISWAITING. We send the split point as a second parameter to + // the idle loop, which means that the main thread will return from the idle // loop when all threads have finished their work at this split point. idle_loop(master, &splitPoint);