Retire redundant sp->slavesCount field

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index b1eac341f62dfb5d61998b1f1fb768577c0aafc8..a04766533b953f27798b7665c4a1d99c76bc4f82 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1043,8 +1043,8 @@ moves_loop: // When in check and at SpNode search starts from here
           &&  depth >= Threads.minimumSplitDepth
           &&  (   !thisThread->activeSplitPoint
                || !thisThread->activeSplitPoint->allSlavesSearching
-               || (   int(Threads.size()) > MAX_SLAVES_PER_SPLITPOINT
-                   && thisThread->activeSplitPoint->slavesCount == MAX_SLAVES_PER_SPLITPOINT))
+               || (   Threads.size() > MAX_SLAVES_PER_SPLITPOINT
+                   && thisThread->activeSplitPoint->slavesMask.count() == MAX_SLAVES_PER_SPLITPOINT))
           &&  thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD)
       {
           assert(bestValue > -VALUE_INFINITE && bestValue < beta);
@@ -1589,7 +1589,7 @@ void Thread::idle_loop() {
           // Try to late join to another split point if none of its slaves has
           // already finished.
           SplitPoint* bestSp = NULL;
-          int bestThread = 0;
+          Thread* bestThread = NULL;
           int bestScore = INT_MAX;
 
           for (size_t i = 0; i < Threads.size(); ++i)
@@ -1599,7 +1599,7 @@ void Thread::idle_loop() {
 
               if (   sp
                   && sp->allSlavesSearching
-                  && sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT
+                  && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
                   && available_to(Threads[i]))
               {
                   assert(this != Threads[i]);
@@ -1610,12 +1610,12 @@ void Thread::idle_loop() {
                   for (SplitPoint* spp = Threads[i]->activeSplitPoint; spp; spp = spp->parentSplitPoint)
                       level++;
 
-                  int score = level * 256 * 256 + sp->slavesCount * 256 - sp->depth * 1;
+                  int score = level * 256 * 256 + (int)sp->slavesMask.count() * 256 - sp->depth * 1;
 
                   if (score < bestScore)
                   {
                       bestSp = sp;
-                      bestThread = i;
+                      bestThread = Threads[i];
                       bestScore = score;
                   }
               }
@@ -1630,11 +1630,10 @@ void Thread::idle_loop() {
               sp->mutex.lock();
 
               if (   sp->allSlavesSearching
-                  && sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT
-                  && available_to(Threads[bestThread]))
+                  && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
+                  && available_to(bestThread))
               {
                   sp->slavesMask.set(idx);
-                  sp->slavesCount++;
                   activeSplitPoint = sp;
                   searching = true;
               }