<< std::endl;
}
- // Reset and wake up the threads
+ // Reset the threads, still sleeping: will be wake up at split time
for (size_t i = 0; i < Threads.size(); i++)
- {
Threads[i].maxPly = 0;
- Threads[i].do_sleep = false;
- if (!Threads.use_sleeping_threads())
- Threads[i].notify_one();
- }
+ Threads.sleepWhileIdle = Options["Use Sleeping Threads"];
// Set best timer interval to avoid lagging under time pressure. Timer is
// used to check for remaining available thinking time.
id_loop(RootPos); // Let's start searching !
Threads.timer_thread()->maxPly = 0; // Stop the timer
-
- // Main thread will go to sleep by itself to avoid a race with start_searching()
- for (size_t i = 0; i < Threads.size(); i++)
- if (&Threads[i] != Threads.main_thread())
- Threads[i].do_sleep = true;
+ Threads.sleepWhileIdle = true; // Send idle threads to sleep
if (Options["Use Search Log"])
{
{
// If we are not searching, wait for a condition to be signaled
// instead of wasting CPU time polling for work.
- while ( do_sleep
- || do_exit
- || (!is_searching && Threads.use_sleeping_threads()))
+ while (do_exit || (!is_searching && Threads.sleepWhileIdle))
{
if (do_exit)
{
// particular we need to avoid a deadlock in case a master thread has,
// in the meanwhile, allocated us and sent the wake_up() call before we
// had the chance to grab the lock.
- if (do_sleep || !is_searching)
+ if (!is_searching && Threads.sleepWhileIdle)
sleepCondition.wait(mutex);
mutex.unlock();
// If this thread has been assigned work, launch a search
if (is_searching)
{
- assert(!do_sleep && !do_exit);
+ assert(/*!is_finished &&*/ !do_exit);
Threads.mutex.lock();
// Wake up master thread so to allow it to return from the idle loop in
// case we are the last slave of the split point.
- if ( Threads.use_sleeping_threads()
+ if ( Threads.sleepWhileIdle
&& this != sp->master
&& !sp->slavesMask)
{
start_fn = fn;
idx = Threads.size();
- do_sleep = (fn != &Thread::main_loop); // Avoid a race with start_searching()
+ 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();
{
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);
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
}
SplitPoint* volatile curSplitPoint;
volatile int splitPointsCnt;
volatile bool is_searching;
- volatile bool do_sleep;
+ volatile bool is_finished;
volatile bool do_exit;
};
void exit(); // be initialized and valid during the whole thread lifetime.
Thread& operator[](size_t id) { return *threads[id]; }
- bool use_sleeping_threads() const { return useSleepingThreads; }
int min_split_depth() const { return minimumSplitDepth; }
size_t size() const { return threads.size(); }
Thread* main_thread() { return threads[0]; }
ConditionVariable sleepCondition;
Depth minimumSplitDepth;
int maxThreadsPerSplitPoint;
- bool useSleepingThreads;
+public:
+ bool sleepWhileIdle;
};
extern ThreadPool Threads;
o["Min Split Depth"] = Option(msd, 4, 7, on_threads);
o["Max Threads per Split Point"] = Option(5, 4, 8, on_threads);
o["Threads"] = Option(cpus, 1, MAX_THREADS, on_threads);
- o["Use Sleeping Threads"] = Option(true, on_threads);
+ o["Use Sleeping Threads"] = Option(true);
o["Hash"] = Option(32, 4, 8192, on_hash_size);
o["Clear Hash"] = Option(on_clear_hash);
o["Ponder"] = Option(true);