Move split() under Thread

Previous renaming patch suggested this reformat:
when a better naming leads to a better code!

No functional change.

diff --git a/src/search.cpp b/src/search.cpp
index 4adcefa9464dcfb740dc6111d26cecbbae0e6e86..49d18b5061e7c480c5f888e6c07c7ed89fed2b0a 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1030,8 +1030,8 @@ split_point_start: // At split points actual search starts from here
       {
           assert(bestValue < beta);
 
       {
           assert(bestValue < beta);
 

-          bestValue = Threads.split<FakeSplit>(pos, ss, alpha, beta, bestValue, &bestMove,
-                                               depth, threatMove, moveCount, mp, NT);
+          bestValue = thisThread->split<FakeSplit>(pos, ss, alpha, beta, bestValue, &bestMove,
+                                                   depth, threatMove, moveCount, mp, NT);

           if (bestValue >= beta)
               break;
       }
           if (bestValue >= beta)
               break;
       }

diff --git a/src/thread.cpp b/src/thread.cpp
index 7be8da88ab8b35efe7e7478a9892f6013268a396..12a9527131b6f73bbb8f46a7b8cb6a219f2e994b 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -249,26 +249,24 @@ bool ThreadPool::slave_available(Thread* master) const {
 // search() then split() returns.
 
 template <bool Fake>
 // search() then split() returns.
 
 template <bool Fake>

-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) {
+Value Thread::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 <= alpha && alpha < beta && beta <= VALUE_INFINITE);
   assert(bestValue > -VALUE_INFINITE);
   assert(depth >= Threads.minimumSplitDepth);
 
 
   assert(pos.pos_is_ok());
   assert(bestValue <= alpha && alpha < beta && beta <= VALUE_INFINITE);
   assert(bestValue > -VALUE_INFINITE);
   assert(depth >= Threads.minimumSplitDepth);
 

-  Thread* thisThread = pos.this_thread();
-
-  assert(thisThread->searching);
-  assert(thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);
+  assert(searching);
+  assert(splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);

 
   // Pick the next available split point from the split point stack
 
   // Pick the next available split point from the split point stack

-  SplitPoint& sp = thisThread->splitPoints[thisThread->splitPointsSize];
+  SplitPoint& sp = splitPoints[splitPointsSize];

 
 

-  sp.masterThread = thisThread;
-  sp.parentSplitPoint = thisThread->activeSplitPoint;
-  sp.slavesMask = 1ULL << thisThread->idx;
+  sp.masterThread = this;
+  sp.parentSplitPoint = activeSplitPoint;
+  sp.slavesMask = 1ULL << idx;

   sp.depth = depth;
   sp.bestMove = *bestMove;
   sp.threatMove = threatMove;
   sp.depth = depth;
   sp.bestMove = *bestMove;
   sp.threatMove = threatMove;


@@ -286,25 +284,25 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
   // Try to allocate available threads and ask them to start searching setting
   // 'searching' flag. This must be done under lock protection to avoid concurrent
   // allocation of the same slave by another master.
   // Try to allocate available threads and ask them to start searching setting
   // 'searching' flag. This must be done under lock protection to avoid concurrent
   // allocation of the same slave by another master.

-  mutex.lock();
+  Threads.mutex.lock();

   sp.mutex.lock();
 
   sp.mutex.lock();
 

-  thisThread->splitPointsSize++;
-  thisThread->activeSplitPoint = &sp;
+  splitPointsSize++;
+  activeSplitPoint = &sp;

 
   size_t slavesCnt = 1; // Master is always included
 
 
   size_t slavesCnt = 1; // Master is always included
 

-  for (size_t i = 0; i < threads.size() && !Fake; ++i)
-      if (threads[i]->is_available_to(thisThread) && ++slavesCnt <= maxThreadsPerSplitPoint)
+  for (size_t i = 0; i < Threads.size() && !Fake; ++i)
+      if (Threads[i].is_available_to(this) && ++slavesCnt <= Threads.maxThreadsPerSplitPoint)

       {
       {

-          sp.slavesMask |= 1ULL << threads[i]->idx;
-          threads[i]->activeSplitPoint = &sp;
-          threads[i]->searching = true; // Slave leaves idle_loop()
-          threads[i]->notify_one(); // Could be sleeping
+          sp.slavesMask |= 1ULL << Threads[i].idx;
+          Threads[i].activeSplitPoint = &sp;
+          Threads[i].searching = true; // Slave leaves idle_loop()
+          Threads[i].notify_one(); // Could be sleeping

       }
 
   sp.mutex.unlock();
       }
 
   sp.mutex.unlock();

-  mutex.unlock();
+  Threads.mutex.unlock();

 
   // Everything is set up. The master thread enters the idle loop, from which
   // it will instantly launch a search, because its 'searching' flag is set.
 
   // Everything is set up. The master thread enters the idle loop, from which
   // it will instantly launch a search, because its 'searching' flag is set.


@@ -312,34 +310,34 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
   // their work at this split point.
   if (slavesCnt > 1 || Fake)
   {
   // their work at this split point.
   if (slavesCnt > 1 || Fake)
   {

-      thisThread->Thread::idle_loop(); // Force a call to base class idle_loop()
+      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.
 
       // 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(!thisThread->searching);
+      assert(!searching);

   }
 
   // We have returned from the idle loop, which means that all threads are
   // finished. Note that setting 'searching' and decreasing splitPointsSize is
   // done under lock protection to avoid a race with Thread::is_available_to().
   }
 
   // We have returned from the idle loop, which means that all threads are
   // finished. Note that setting 'searching' and decreasing splitPointsSize is
   // done under lock protection to avoid a race with Thread::is_available_to().

-  mutex.lock();
+  Threads.mutex.lock();

   sp.mutex.lock();
 
   sp.mutex.lock();
 

-  thisThread->searching = true;
-  thisThread->splitPointsSize--;
-  thisThread->activeSplitPoint = sp.parentSplitPoint;
+  searching = true;
+  splitPointsSize--;
+  activeSplitPoint = sp.parentSplitPoint;

   pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
   *bestMove = sp.bestMove;
 
   sp.mutex.unlock();
   pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
   *bestMove = sp.bestMove;
 
   sp.mutex.unlock();

-  mutex.unlock();
+  Threads.mutex.unlock();

 
   return sp.bestValue;
 }
 
 // Explicit template instantiations
 
   return sp.bestValue;
 }
 
 // Explicit template instantiations

-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);
+template Value Thread::split<false>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);
+template Value Thread::split<true>(Position&, Stack*, Value, Value, Value, Move*, Depth, Move, int, MovePicker&, int);

 
 
 // wait_for_think_finished() waits for main thread to go to sleep then returns
 
 
 // wait_for_think_finished() waits for main thread to go to sleep then returns

diff --git a/src/thread.h b/src/thread.h
index d24b65dc7700a1a33b492c103b01a1a4527f0093..76a2d8436f91b9fa957856835c39a4f211b151df 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -102,6 +102,10 @@ struct Thread {
   bool is_available_to(Thread* master) const;
   void wait_for(volatile const bool& b);
 
   bool is_available_to(Thread* master) const;
   void wait_for(volatile const bool& b);
 

+  template <bool Fake>
+  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
+              Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType);
+

   SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
   Material::Table materialTable;
   Endgames endgames;
   SplitPoint splitPoints[MAX_SPLITPOINTS_PER_THREAD];
   Material::Table materialTable;
   Endgames endgames;


@@ -155,19 +159,15 @@ public:
   void start_thinking(const Position&, const Search::LimitsType&,
                       const std::vector<Move>&, Search::StateStackPtr&);
 
   void start_thinking(const Position&, const Search::LimitsType&,
                       const std::vector<Move>&, Search::StateStackPtr&);
 

-  template <bool Fake>
-  Value split(Position& pos, Search::Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove,
-              Depth depth, Move threatMove, int moveCount, MovePicker& mp, int nodeType);
-

   bool sleepWhileIdle;
   Depth minimumSplitDepth;
   bool sleepWhileIdle;
   Depth minimumSplitDepth;

+  size_t maxThreadsPerSplitPoint;

   Mutex mutex;
   ConditionVariable sleepCondition;
 
 private:
   std::vector<Thread*> threads;
   TimerThread* timer;
   Mutex mutex;
   ConditionVariable sleepCondition;
 
 private:
   std::vector<Thread*> threads;
   TimerThread* timer;

-  size_t maxThreadsPerSplitPoint;

 };
 
 extern ThreadPool Threads;
 };
 
 extern ThreadPool Threads;