curSplitPoint = NULL;
start_fn = fn;
idx = Threads.size();
- do_sleep = true;
+
+ is_finished = (fn != &Thread::main_loop); // Avoid a race with start_searching()
if (!thread_create(handle, start_routine, this))
{
Thread::~Thread() {
- assert(do_sleep);
+ assert(is_finished);
do_exit = true; // Search must be already finished
notify_one();
while (!do_exit)
{
mutex.lock();
- sleepCondition.wait_for(mutex, maxPly ? maxPly : INT_MAX);
+ while (!maxPly && !do_exit)
+ sleepCondition.wait_for(mutex, maxPly ? maxPly : INT_MAX);
mutex.unlock();
check_time();
}
{
mutex.lock();
- do_sleep = true; // Always return to sleep after a search
+ is_finished = true; // Always return to sleep after a search
is_searching = false;
- while (do_sleep && !do_exit)
+ while (is_finished && !do_exit)
{
Threads.sleepCondition.notify_one(); // Wake up UI thread if needed
sleepCondition.wait(mutex);
timer = new Thread(&Thread::timer_loop);
threads.push_back(new Thread(&Thread::main_loop));
+ sleepWhileIdle = true;
read_uci_options();
}
maxThreadsPerSplitPoint = Options["Max Threads per Split Point"];
minimumSplitDepth = Options["Min Split Depth"] * ONE_PLY;
- useSleepingThreads = Options["Use Sleeping Threads"];
size_t requested = Options["Threads"];
assert(requested > 0);
}
-// set_timer() is used to set the timer to trigger after msec milliseconds.
-// If msec is 0 then timer is stopped.
-
-void ThreadPool::set_timer(int msec) {
-
- timer->maxPly = msec;
- timer->notify_one(); // Wake up and restart the timer
-}
-
-
// split() does the actual work of distributing the work at a node between
// several available threads. If it does not succeed in splitting the node
// (because no idle threads are available, or because we have no unused split
sp.slavesMask |= 1ULL << i;
threads[i]->curSplitPoint = &sp;
threads[i]->is_searching = true; // Slave leaves idle_loop()
-
- if (useSleepingThreads)
- threads[i]->notify_one();
+ threads[i]->notify_one(); // Could be sleeping
if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
break;
Thread* t = main_thread();
t->mutex.lock();
- while (!t->do_sleep) sleepCondition.wait(t->mutex);
+ while (!t->is_finished) sleepCondition.wait(t->mutex);
t->mutex.unlock();
}
if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
RootMoves.push_back(RootMove(ml.move()));
- main_thread()->do_sleep = false;
- main_thread()->notify_one();
+ main_thread()->is_finished = false;
+ main_thread()->notify_one(); // Starts main thread
}