Sync with master

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 67693a38986dc1f93cdd285bc6244c8ec00f0e27..893308953804b748d363af2bbbf266fe147e0716 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1583,8 +1583,7 @@ void Thread::idle_loop() {
           // Try to late join to another split point if none of its slaves has
           // already finished.
           SplitPoint* bestSp = NULL;
-          Thread* bestThread = NULL;
-          int bestScore = INT_MAX;
+          int minLevel = INT_MAX;
 
           for (Thread* th : Threads)
           {
@@ -1602,17 +1601,14 @@ void Thread::idle_loop() {
 
                   // Prefer to join to SP with few parents to reduce the probability
                   // that a cut-off occurs above us, and hence we waste our work.
-                  int level = -1;
-                  for (SplitPoint* spp = th->activeSplitPoint; spp; spp = spp->parentSplitPoint)
+                  int level = 0;
+                  for (SplitPoint* p = th->activeSplitPoint; p; p = p->parentSplitPoint)
                       level++;
 
-                  int score = level * 256 * 256 + (int)sp->slavesMask.count() * 256 - sp->depth * 1;
-
-                  if (score < bestScore)
+                  if (level < minLevel)
                   {
                       bestSp = sp;
-                      bestThread = th;
-                      bestScore = score;
+                      minLevel = level;
                   }
               }
           }
@@ -1627,7 +1623,7 @@ void Thread::idle_loop() {
 
               if (   sp->allSlavesSearching
                   && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
-                  && available_to(bestThread))
+                  && available_to(sp->master))
               {
                   sp->slavesMask.set(idx);
                   activeSplitPoint = sp;