do_sleep = (fn != &Thread::main_loop); // Avoid a race with start_searching()
- lock_init(sleepLock);
- cond_init(sleepCond);
-
- for (int j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++)
- lock_init(splitPoints[j].lock);
-
if (!thread_create(handle, start_routine, this))
{
std::cerr << "Failed to create thread number " << idx << std::endl;
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);
}
while (!do_exit)
{
- lock_grab(sleepLock);
- timed_wait(sleepCond, sleepLock, maxPly ? maxPly : INT_MAX);
- lock_release(sleepLock);
+ mutex.lock();
+ sleepCondition.wait_for(mutex, maxPly ? maxPly : INT_MAX);
+ mutex.unlock();
check_time();
}
}
while (true)
{
- lock_grab(sleepLock);
+ mutex.lock();
do_sleep = true; // Always return to sleep after a search
is_searching = false;
while (do_sleep && !do_exit)
{
- cond_signal(Threads.sleepCond); // Wake up UI thread if needed
- cond_wait(sleepCond, sleepLock);
+ Threads.sleepCondition.notify_one(); // Wake up UI thread if needed
+ sleepCondition.wait(mutex);
}
- lock_release(sleepLock);
+ mutex.unlock();
if (do_exit)
return;
is_searching = true;
Search::think();
+
+ assert(is_searching);
}
}
void Thread::wake_up() {
- lock_grab(sleepLock);
- cond_signal(sleepCond);
- lock_release(sleepLock);
+ mutex.lock();
+ sleepCondition.notify_one();
+ mutex.unlock();
}
Signals.stopOnPonderhit = true;
- lock_grab(sleepLock);
- while (!Signals.stop) cond_wait(sleepCond, sleepLock);
- lock_release(sleepLock);
+ mutex.lock();
+ while (!Signals.stop) sleepCondition.wait(mutex);;
+ mutex.unlock();
}
void ThreadPool::init() {
- cond_init(sleepCond);
- lock_init(splitLock);
timer = new Thread(&Thread::timer_loop);
threads.push_back(new Thread(&Thread::main_loop));
read_uci_options();
ThreadPool::~ThreadPool() {
- for (size_t i = 0; i < size(); i++)
+ for (size_t i = 0; i < threads.size(); i++)
delete threads[i];
delete timer;
- lock_destroy(splitLock);
- cond_destroy(sleepCond);
}
assert(requested > 0);
- while (size() < requested)
+ while (threads.size() < requested)
threads.push_back(new Thread(&Thread::idle_loop));
- while (size() > requested)
+ while (threads.size() > requested)
{
delete threads.back();
threads.pop_back();
void ThreadPool::wake_up() const {
- for (size_t i = 0; i < size(); i++)
+ for (size_t i = 0; i < threads.size(); i++)
{
threads[i]->maxPly = 0;
threads[i]->do_sleep = false;
void ThreadPool::sleep() const {
- for (size_t 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()
+ // Main thread will go to sleep by itself to avoid a race with start_searching()
+ for (size_t i = 1; i < threads.size(); i++)
+ threads[i]->do_sleep = true;
}
bool ThreadPool::available_slave_exists(Thread* master) const {
- for (size_t i = 0; i < size(); i++)
+ for (size_t i = 0; i < threads.size(); i++)
if (threads[i]->is_available_to(master))
return true;
// Try to allocate available threads and ask them to start searching setting
// is_searching flag. This must be done under lock protection to avoid concurrent
// allocation of the same slave by another master.
- lock_grab(sp.lock);
- lock_grab(splitLock);
+ sp.mutex.lock();
+ mutex.lock();
- for (size_t i = 0; i < size() && !Fake; ++i)
+ for (size_t i = 0; i < threads.size() && !Fake; ++i)
if (threads[i]->is_available_to(master))
{
sp.slavesMask |= 1ULL << i;
master->splitPointsCnt++;
- lock_release(splitLock);
- lock_release(sp.lock);
+ mutex.unlock();
+ sp.mutex.unlock();
// Everything is set up. The master thread enters the idle loop, from which
// it will instantly launch a search, because its is_searching flag is set.
// We have returned from the idle loop, which means that all threads are
// finished. Note that setting is_searching and decreasing splitPointsCnt is
// done under lock protection to avoid a race with Thread::is_available_to().
- lock_grab(sp.lock); // To protect sp.nodes
- lock_grab(splitLock);
+ sp.mutex.lock(); // To protect sp.nodes
+ mutex.lock();
master->is_searching = true;
master->splitPointsCnt--;
pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
*bestMove = sp.bestMove;
- lock_release(splitLock);
- lock_release(sp.lock);
+ mutex.unlock();
+ sp.mutex.unlock();
return sp.bestValue;
}
void ThreadPool::set_timer(int msec) {
- lock_grab(timer->sleepLock);
+ timer->mutex.lock();
timer->maxPly = msec;
- cond_signal(timer->sleepCond); // Wake up and restart the timer
- lock_release(timer->sleepLock);
+ timer->sleepCondition.notify_one(); // Wake up and restart the timer
+ timer->mutex.unlock();
}
void ThreadPool::wait_for_search_finished() {
Thread* t = main_thread();
- lock_grab(t->sleepLock);
- cond_signal(t->sleepCond); // In case is waiting for stop or ponderhit
- while (!t->do_sleep) cond_wait(sleepCond, t->sleepLock);
- lock_release(t->sleepLock);
+ t->mutex.lock();
+ t->sleepCondition.notify_one(); // In case is waiting for stop or ponderhit
+ while (!t->do_sleep) sleepCondition.wait(t->mutex);
+ t->mutex.unlock();
}
// a new search, then returns immediately.
void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
- const std::vector<Move>& searchMoves) {
+ const std::vector<Move>& searchMoves, StateStackPtr& states) {
wait_for_search_finished();
SearchTime.restart(); // As early as possible
RootPosition = pos;
Limits = limits;
+ SetupStates = states; // Ownership transfer here
RootMoves.clear();
for (MoveList<LEGAL> ml(pos); !ml.end(); ++ml)