namespace { extern "C" {
// start_routine() is the C function which is called when a new thread
- // is launched. It is a wrapper to member function pointed by start_fn.
+ // is launched. It is a wrapper to the virtual function idle_loop().
- long start_routine(Thread* th) { (th->*(th->start_fn))(); return 0; }
+ long start_routine(Thread* th) { th->idle_loop(); return 0; }
} }
// Thread c'tor starts a newly-created thread of execution that will call
-// the idle loop function pointed by start_fn going immediately to sleep.
+// the the virtual function idle_loop(), going immediately to sleep.
-Thread::Thread(Fn fn) : splitPoints() {
+Thread::Thread() : splitPoints() {
- is_searching = do_exit = false;
+ searching = exit = false;
maxPly = splitPointsCnt = 0;
curSplitPoint = NULL;
- start_fn = fn;
idx = Threads.size();
- do_sleep = (fn != &Thread::main_loop); // Avoid a race with start_searching()
-
if (!thread_create(handle, start_routine, this))
{
std::cerr << "Failed to create thread number " << idx << std::endl;
}
-// Thread d'tor waits for thread termination before to return.
+// Thread d'tor waits for thread termination before to return
Thread::~Thread() {
- assert(do_sleep);
-
- do_exit = true; // Search must be already finished
+ exit = true; // Search must be already finished
notify_one();
thread_join(handle); // Wait for thread termination
}
-// Thread::timer_loop() is where the timer thread waits maxPly milliseconds and
-// then calls check_time(). If maxPly is 0 thread sleeps until is woken up.
+// TimerThread::idle_loop() is where the timer thread waits msec milliseconds
+// and then calls check_time(). If msec is 0 thread sleeps until is woken up.
extern void check_time();
-void Thread::timer_loop() {
+void TimerThread::idle_loop() {
- while (!do_exit)
+ while (!exit)
{
mutex.lock();
- sleepCondition.wait_for(mutex, maxPly ? maxPly : INT_MAX);
+
+ if (!exit)
+ sleepCondition.wait_for(mutex, msec ? msec : INT_MAX);
+
mutex.unlock();
- check_time();
+
+ if (msec)
+ check_time();
}
}
-// Thread::main_loop() is where the main thread is parked waiting to be started
+// MainThread::idle_loop() is where the main thread is parked waiting to be started
// when there is a new search. Main thread will launch all the slave threads.
-void Thread::main_loop() {
+void MainThread::idle_loop() {
while (true)
{
mutex.lock();
- do_sleep = true; // Always return to sleep after a search
- is_searching = false;
+ thinking = false;
- while (do_sleep && !do_exit)
+ while (!thinking && !exit)
{
Threads.sleepCondition.notify_one(); // Wake up UI thread if needed
sleepCondition.wait(mutex);
mutex.unlock();
- if (do_exit)
+ if (exit)
return;
- is_searching = true;
+ searching = true;
Search::think();
- assert(is_searching);
+ assert(searching);
+
+ searching = false;
}
}
-// Thread::notify_one() wakes up the thread, normally at the beginning of the
-// search or, if "sleeping threads" is used at split time.
+// Thread::notify_one() wakes up the thread when there is some search to do
void Thread::notify_one() {
bool Thread::is_available_to(Thread* master) const {
- if (is_searching)
+ if (searching)
return false;
// Make a local copy to be sure doesn't become zero under our feet while
void ThreadPool::init() {
- timer = new Thread(&Thread::timer_loop);
- threads.push_back(new Thread(&Thread::main_loop));
+ sleepWhileIdle = true;
+ timer = new TimerThread();
+ threads.push_back(new MainThread());
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);
while (threads.size() < requested)
- threads.push_back(new Thread(&Thread::idle_loop));
+ threads.push_back(new Thread());
while (threads.size() > requested)
{
}
-// 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.nodes = 0;
sp.ss = ss;
- assert(master->is_searching);
+ assert(master->searching);
master->curSplitPoint = &sp;
int slavesCnt = 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]->searching = true; // Slave leaves idle_loop()
+ threads[i]->notify_one(); // Could be sleeping
if (++slavesCnt + 1 >= maxThreadsPerSplitPoint) // Master is always included
break;
// their work at this split point.
if (slavesCnt || Fake)
{
- master->idle_loop();
+ master->Thread::idle_loop(); // Force a call to base class idle_loop()
// In helpful master concept a master can help only a sub-tree of its split
// point, and because here is all finished is not possible master is booked.
- assert(!master->is_searching);
+ assert(!master->searching);
}
// We have returned from the idle loop, which means that all threads are
mutex.lock();
sp.mutex.lock();
- master->is_searching = true;
+ master->searching = true;
master->splitPointsCnt--;
master->curSplitPoint = sp.parent;
pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
template Value ThreadPool::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
-// wait_for_search_finished() waits for main thread to go to sleep, this means
-// search is finished. Then returns.
+// wait_for_think_finished() waits for main thread to go to sleep then returns
-void ThreadPool::wait_for_search_finished() {
+void ThreadPool::wait_for_think_finished() {
- Thread* t = main_thread();
+ MainThread* t = main_thread();
t->mutex.lock();
- while (!t->do_sleep) sleepCondition.wait(t->mutex);
+ while (t->thinking) sleepCondition.wait(t->mutex);
t->mutex.unlock();
}
-// start_searching() wakes up the main thread sleeping in main_loop() so to start
+// start_thinking() wakes up the main thread sleeping in main_loop() so to start
// a new search, then returns immediately.
-void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
- const std::vector<Move>& searchMoves, StateStackPtr& states) {
- wait_for_search_finished();
+void ThreadPool::start_thinking(const Position& pos, const LimitsType& limits,
+ const std::vector<Move>& searchMoves, StateStackPtr& states) {
+ wait_for_think_finished();
SearchTime = Time::now(); // As early as possible
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()->thinking = true;
+ main_thread()->notify_one(); // Starts main thread
}
projects / stockfish / blobdiff