X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fthread.cpp;h=ae0fa1ceddd33779ddc333e58748f5ad3a13779c;hp=4ae268eb77b9ae885554bf4e60c78ef1e2ebf032;hb=960a689769cb143afa364d3669940c18d0c3a503;hpb=0439a79566d03065317b2025b9b479b9ae9f2d65

diff --git a/src/thread.cpp b/src/thread.cpp
index 4ae268eb..ae0fa1ce 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -27,7 +27,7 @@
 
 using namespace Search;
 
-ThreadsManager Threads; // Global object
+ThreadPool Threads; // Global object
 
 namespace { extern "C" {
 
@@ -48,7 +48,7 @@ Thread::Thread(Fn fn) {
   maxPly = splitPointsCnt = 0;
   curSplitPoint = NULL;
   start_fn = fn;
-  threadID = Threads.size();
+  idx = Threads.size();
 
   do_sleep = (fn != &Thread::main_loop); // Avoid a race with start_searching()
 
@@ -60,7 +60,7 @@ Thread::Thread(Fn fn) {
 
   if (!thread_create(handle, start_routine, this))
   {
-      std::cerr << "Failed to create thread number " << threadID << std::endl;
+      std::cerr << "Failed to create thread number " << idx << std::endl;
       ::exit(EXIT_FAILURE);
   }
 }
@@ -173,13 +173,13 @@ bool Thread::cutoff_occurred() const {
 
 
 // Thread::is_available_to() checks whether the thread is available to help the
-// thread with threadID "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 active split point, it is only available as a
-// slave to the threads which are busy searching the split point at the top of
-// "slave"'s split point stack (the "helpful master concept" in YBWC terminology).
+// 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 active split point, it is only available as a slave to the
+// slaves which are busy searching the split point at the top of slaves split
+// point stack (the "helpful master concept" in YBWC terminology).
 
-bool Thread::is_available_to(int master) const {
+bool Thread::is_available_to(Thread* master) const {
 
   if (is_searching)
       return false;
@@ -190,7 +190,7 @@ bool Thread::is_available_to(int master) const {
 
   // No active split points means that the thread is available as a slave for any
   // other thread otherwise apply the "helpful master" concept if possible.
-  return !spCnt || (splitPoints[spCnt - 1].slavesMask & (1ULL << master));
+  return !spCnt || (splitPoints[spCnt - 1].slavesMask & (1ULL << master->idx));
 }
 
 
@@ -199,7 +199,7 @@ bool Thread::is_available_to(int master) const {
 // a c'tor becuase Threads is a static object and we need a fully initialized
 // engine at this point due to allocation of endgames in Thread c'tor.
 
-void ThreadsManager::init() {
+void ThreadPool::init() {
 
   cond_init(sleepCond);
   lock_init(splitLock);
@@ -211,7 +211,7 @@ void ThreadsManager::init() {
 
 // d'tor cleanly terminates the threads when the program exits.
 
-ThreadsManager::~ThreadsManager() {
+ThreadPool::~ThreadPool() {
 
   for (int i = 0; i < size(); i++)
       delete threads[i];
@@ -227,7 +227,7 @@ ThreadsManager::~ThreadsManager() {
 // objects are dynamically allocated to avoid creating in advance all possible
 // threads, with included pawns and material tables, if only few are used.
 
-void ThreadsManager::read_uci_options() {
+void ThreadPool::read_uci_options() {
 
   maxThreadsPerSplitPoint = Options["Max Threads per Split Point"];
   minimumSplitDepth       = Options["Min Split Depth"] * ONE_PLY;
@@ -251,7 +251,7 @@ void ThreadsManager::read_uci_options() {
 // on the sleep condition and to reset maxPly. When useSleepingThreads is set
 // threads will be woken up at split time.
 
-void ThreadsManager::wake_up() const {
+void ThreadPool::wake_up() const {
 
   for (int i = 0; i < size(); i++)
   {
@@ -267,7 +267,7 @@ void ThreadsManager::wake_up() const {
 // sleep() is called after the search finishes to ask all the threads but the
 // main one to go waiting on a sleep condition.
 
-void ThreadsManager::sleep() const {
+void ThreadPool::sleep() const {
 
   for (int 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()
@@ -275,11 +275,9 @@ void ThreadsManager::sleep() const {
 
 
 // available_slave_exists() tries to find an idle thread which is available as
-// a slave for the thread with threadID 'master'.
+// a slave for the thread 'master'.
 
-bool ThreadsManager::available_slave_exists(int master) const {
-
-  assert(master >= 0 && master < size());
+bool ThreadPool::available_slave_exists(Thread* master) const {
 
   for (int i = 0; i < size(); i++)
       if (threads[i]->is_available_to(master))
@@ -299,9 +297,10 @@ bool ThreadsManager::available_slave_exists(int master) const {
 // search(). When all threads have returned from search() then split() returns.
 
 template <bool Fake>
-Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
-                            Value bestValue, Move* bestMove, Depth depth,
-                            Move threatMove, int moveCount, MovePicker* mp, int nodeType) {
+Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
+                        Value bestValue, Move* bestMove, Depth depth,
+                        Move threatMove, int moveCount, MovePicker* mp, int nodeType) {
+
   assert(pos.pos_is_ok());
   assert(bestValue > -VALUE_INFINITE);
   assert(bestValue <= alpha);
@@ -309,19 +308,18 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
   assert(beta <= VALUE_INFINITE);
   assert(depth > DEPTH_ZERO);
 
-  int master = pos.this_thread();
-  Thread& masterThread = *threads[master];
+  Thread* master = pos.this_thread();
 
-  if (masterThread.splitPointsCnt >= MAX_SPLITPOINTS_PER_THREAD)
+  if (master->splitPointsCnt >= MAX_SPLITPOINTS_PER_THREAD)
       return bestValue;
 
   // Pick the next available split point from the split point stack
-  SplitPoint* sp = &masterThread.splitPoints[masterThread.splitPointsCnt++];
+  SplitPoint* sp = &master->splitPoints[master->splitPointsCnt];
 
-  sp->parent = masterThread.curSplitPoint;
+  sp->parent = master->curSplitPoint;
   sp->master = master;
   sp->cutoff = false;
-  sp->slavesMask = 1ULL << master;
+  sp->slavesMask = 1ULL << master->idx;
   sp->depth = depth;
   sp->bestMove = *bestMove;
   sp->threatMove = threatMove;
@@ -335,9 +333,9 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
   sp->nodes = 0;
   sp->ss = ss;
 
-  assert(masterThread.is_searching);
+  assert(master->is_searching);
 
-  masterThread.curSplitPoint = sp;
+  master->curSplitPoint = sp;
   int slavesCnt = 0;
 
   // Try to allocate available threads and ask them to start searching setting
@@ -360,6 +358,8 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
               break;
       }
 
+  master->splitPointsCnt++;
+
   lock_release(splitLock);
   lock_release(sp->lock);
 
@@ -370,11 +370,11 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
   // their work at this split point.
   if (slavesCnt || Fake)
   {
-      masterThread.idle_loop(sp);
+      master->idle_loop(sp);
 
       // 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(!masterThread.is_searching);
+      assert(!master->is_searching);
   }
 
   // We have returned from the idle loop, which means that all threads are
@@ -383,9 +383,9 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
   lock_grab(sp->lock); // To protect sp->nodes
   lock_grab(splitLock);
 
-  masterThread.is_searching = true;
-  masterThread.splitPointsCnt--;
-  masterThread.curSplitPoint = sp->parent;
+  master->is_searching = true;
+  master->splitPointsCnt--;
+  master->curSplitPoint = sp->parent;
   pos.set_nodes_searched(pos.nodes_searched() + sp->nodes);
   *bestMove = sp->bestMove;
 
@@ -396,14 +396,14 @@ Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta,
 }
 
 // Explicit template instantiations
-template Value ThreadsManager::split<false>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker*, int);
-template Value ThreadsManager::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker*, int);
+template Value ThreadPool::split<false>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker*, int);
+template Value ThreadPool::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker*, int);
 
 
-// ThreadsManager::set_timer() is used to set the timer to trigger after msec
-// milliseconds. If msec is 0 then timer is stopped.
+// set_timer() is used to set the timer to trigger after msec milliseconds.
+// If msec is 0 then timer is stopped.
 
-void ThreadsManager::set_timer(int msec) {
+void ThreadPool::set_timer(int msec) {
 
   lock_grab(timer->sleepLock);
   timer->maxPly = msec;
@@ -412,23 +412,23 @@ void ThreadsManager::set_timer(int msec) {
 }
 
 
-// ThreadsManager::wait_for_search_finished() waits for main thread to go to
-// sleep, this means search is finished. Then returns.
+// wait_for_search_finished() waits for main thread to go to sleep, this means
+// search is finished. Then returns.
 
-void ThreadsManager::wait_for_search_finished() {
+void ThreadPool::wait_for_search_finished() {
 
-  Thread* main = threads[0];
-  lock_grab(main->sleepLock);
-  cond_signal(main->sleepCond); // In case is waiting for stop or ponderhit
-  while (!main->do_sleep) cond_wait(sleepCond, main->sleepLock);
-  lock_release(main->sleepLock);
+  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);
 }
 
 
-// ThreadsManager::start_searching() wakes up the main thread sleeping in
-// main_loop() so to start a new search, then returns immediately.
+// start_searching() wakes up the main thread sleeping in  main_loop() so to start
+// a new search, then returns immediately.
 
-void ThreadsManager::start_searching(const Position& pos, const LimitsType& limits,
+void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
                                      const std::vector<Move>& searchMoves) {
   wait_for_search_finished();
 
@@ -437,7 +437,7 @@ void ThreadsManager::start_searching(const Position& pos, const LimitsType& limi
   Signals.stopOnPonderhit = Signals.firstRootMove = false;
   Signals.stop = Signals.failedLowAtRoot = false;
 
-  RootPosition.copy(pos, 0);
+  RootPosition = pos;
   Limits = limits;
   RootMoves.clear();
 
@@ -445,6 +445,6 @@ void ThreadsManager::start_searching(const Position& pos, const LimitsType& limi
       if (searchMoves.empty() || count(searchMoves.begin(), searchMoves.end(), ml.move()))
           RootMoves.push_back(RootMove(ml.move()));
 
-  threads[0]->do_sleep = false;
-  threads[0]->wake_up();
+  main_thread()->do_sleep = false;
+  main_thread()->wake_up();
 }