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().
-
- extern "C" { long start_routine(ThreadBase* 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 the object must be fully initialized
// when start_routine (and hence virtual idle_loop) is called and when joining.
template<typename T> T* new_thread() {
T* th = new T();
- thread_create(th->handle, start_routine, th); // Will go to sleep
+ th->nativeThread = std::thread(&ThreadBase::idle_loop, th); // Will go to sleep
return th;
}
th->mutex.unlock();
th->notify_one();
- thread_join(th->handle); // Wait for thread termination
+ th->nativeThread.join(); // Wait for thread termination
delete th;
}
void ThreadBase::notify_one() {
- mutex.lock();
+ std::unique_lock<std::mutex>(this->mutex);
sleepCondition.notify_one();
- mutex.unlock();
}
void ThreadBase::wait_for(volatile const bool& condition) {
- mutex.lock();
- while (!condition) sleepCondition.wait(mutex);
- mutex.unlock();
+ std::unique_lock<std::mutex> lk(mutex);
+ sleepCondition.wait(lk, [&]{ return condition; });
}
// Thread c'tor makes some init but does not launch any execution thread that
// will be started only when c'tor returns.
-Thread::Thread() /* : splitPoints() */ { // Value-initialization bug in MSVC
+Thread::Thread() /* : splitPoints() */ { // Initialization of non POD broken in MSVC
searching = false;
- maxPly = splitPointsSize = 0;
- activeSplitPoint = NULL;
- activePosition = NULL;
+ maxPly = 0;
+ splitPointsSize = 0;
+ activeSplitPoint = nullptr;
+ activePosition = nullptr;
idx = Threads.size(); // Starts from 0
}
}
-// Thread::available_to() checks whether the thread is available to help the
-// thread 'master' at a split point. An obvious requirement is that thread must
-// be idle. With more than two threads, this is not sufficient: If the thread is
-// the master of some split point, it is only available as a slave to the slaves
-// which are busy searching the split point at the top of slave's split point
-// stack (the "helpful master concept" in YBWC terminology).
+// Thread::can_join() checks whether the thread is available to join the split
+// point 'sp'. An obvious requirement is that thread must be idle. With more than
+// two threads, this is not sufficient: If the thread is the master of some split
+// point, it is only available as a slave for the split points below his active
+// one (the "helpful master" concept in YBWC terminology).
-bool Thread::available_to(const Thread* master) const {
+bool Thread::can_join(const SplitPoint* sp) const {
if (searching)
return false;
// Make a local copy to be sure it doesn't become zero under our feet while
// testing next condition and so leading to an out of bounds access.
- const int size = splitPointsSize;
+ const size_t size = splitPointsSize;
// No split points means that the thread is available as a slave for any
// other thread otherwise apply the "helpful master" concept if possible.
- return !size || splitPoints[size - 1].slavesMask.test(master->idx);
+ return !size || splitPoints[size - 1].slavesMask.test(sp->master->idx);
}
// Pick and init the next available split point
SplitPoint& sp = splitPoints[splitPointsSize];
- sp.masterThread = this;
+ sp.master = this;
sp.parentSplitPoint = activeSplitPoint;
sp.slavesMask = 0, sp.slavesMask.set(idx);
sp.depth = depth;
// Try to allocate available threads and ask them to start searching setting
// 'searching' flag. This must be done under lock protection to avoid concurrent
// allocation of the same slave by another master.
- Threads.mutex.lock();
- sp.mutex.lock();
+ Threads.spinlock.acquire();
+ sp.spinlock.acquire();
sp.allSlavesSearching = true; // Must be set under lock protection
++splitPointsSize;
activeSplitPoint = &sp;
- activePosition = NULL;
+ activePosition = nullptr;
Thread* slave;
- while ((slave = Threads.available_slave(this)) != NULL)
+ while ( sp.slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
+ && (slave = Threads.available_slave(activeSplitPoint)) != nullptr)
{
sp.slavesMask.set(slave->idx);
- slave->activeSplitPoint = &sp;
+ slave->activeSplitPoint = activeSplitPoint;
slave->searching = true; // Slave leaves idle_loop()
slave->notify_one(); // Could be sleeping
}
// 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.
- sp.mutex.unlock();
- Threads.mutex.unlock();
+ sp.spinlock.release();
+ Threads.spinlock.release();
Thread::idle_loop(); // Force a call to base class idle_loop()
// We have returned from the idle loop, which means that all threads are
// finished. Note that setting 'searching' and decreasing splitPointsSize must
// be done under lock protection to avoid a race with Thread::available_to().
- Threads.mutex.lock();
- sp.mutex.lock();
+ Threads.spinlock.acquire();
+ sp.spinlock.acquire();
searching = true;
--splitPointsSize;
*bestMove = sp.bestMove;
*bestValue = sp.bestValue;
- sp.mutex.unlock();
- Threads.mutex.unlock();
+ sp.spinlock.release();
+ Threads.spinlock.release();
}
while (!exit)
{
- mutex.lock();
+ std::unique_lock<std::mutex> lk(mutex);
if (!exit)
- sleepCondition.wait_for(mutex, run ? Resolution : INT_MAX);
+ sleepCondition.wait_for(lk, std::chrono::milliseconds(run ? Resolution : INT_MAX));
- mutex.unlock();
+ lk.unlock();
if (run)
check_time();
while (!exit)
{
- mutex.lock();
+ std::unique_lock<std::mutex> lk(mutex);
thinking = false;
while (!thinking && !exit)
{
Threads.sleepCondition.notify_one(); // Wake up the UI thread if needed
- sleepCondition.wait(mutex);
+ sleepCondition.wait(lk);
}
- mutex.unlock();
+ lk.unlock();
if (!exit)
{
delete_thread(timer); // As first because check_time() accesses threads data
- for (iterator it = begin(); it != end(); ++it)
- delete_thread(*it);
+ for (Thread* th : *this)
+ delete_thread(th);
}
// ThreadPool::available_slave() tries to find an idle thread which is available
-// as a slave for the thread 'master'.
+// to join SplitPoint 'sp'.
-Thread* ThreadPool::available_slave(const Thread* master) const {
+Thread* ThreadPool::available_slave(const SplitPoint* sp) const {
- for (const_iterator it = begin(); it != end(); ++it)
- if ((*it)->available_to(master))
- return *it;
+ for (Thread* th : *this)
+ if (th->can_join(sp))
+ return th;
- return NULL;
+ return nullptr;
}
void ThreadPool::wait_for_think_finished() {
- MainThread* th = main();
- th->mutex.lock();
- while (th->thinking) sleepCondition.wait(th->mutex);
- th->mutex.unlock();
+ std::unique_lock<std::mutex> lk(main()->mutex);
+ sleepCondition.wait(lk, [&]{ return !main()->thinking; });
}
StateStackPtr& states) {
wait_for_think_finished();
- SearchTime = Time::now(); // As early as possible
+ SearchTime = now(); // As early as possible
Signals.stopOnPonderhit = Signals.firstRootMove = false;
Signals.stop = Signals.failedLowAtRoot = false;
Limits = limits;
if (states.get()) // If we don't set a new position, preserve current state
{
- SetupStates = states; // Ownership transfer here
+ SetupStates = std::move(states); // Ownership transfer here
assert(!states.get());
}
- for (MoveList<LEGAL> it(pos); *it; ++it)
+ for (const auto& m : MoveList<LEGAL>(pos))
if ( limits.searchmoves.empty()
- || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), *it))
- RootMoves.push_back(RootMove(*it));
+ || std::count(limits.searchmoves.begin(), limits.searchmoves.end(), m))
+ RootMoves.push_back(RootMove(m));
main()->thinking = true;
main()->notify_one(); // Starts main thread
projects / stockfish / blobdiff