&& 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);
// Try to late join to another split point if none of its slaves has
// already finished.
- if (Threads.size() > 2)
+ SplitPoint* bestSp = NULL;
+ Thread* bestThread = NULL;
+ int bestScore = INT_MAX;
+
+ for (size_t i = 0; i < Threads.size(); ++i)
{
- SplitPoint *bestSp = NULL;
- int bestThread = 0;
- int bestScore = INT_MAX;
+ const size_t size = Threads[i]->splitPointsSize; // Local copy
+ sp = size ? &Threads[i]->splitPoints[size - 1] : NULL;
- for (size_t i = 0; i < Threads.size(); ++i)
+ if ( sp
+ && sp->allSlavesSearching
+ && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
+ && available_to(Threads[i]))
{
- const int size = Threads[i]->splitPointsSize; // Local copy
- sp = size ? &Threads[i]->splitPoints[size - 1] : NULL;
+ assert(this != Threads[i]);
+ assert(!(this_sp && this_sp->slavesMask.none()));
+ assert(Threads.size() > 2);
+
+ // 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 = Threads[i]->activeSplitPoint; spp; spp = spp->parentSplitPoint)
+ level++;
+
+ int score = level * 256 * 256 + (int)sp->slavesMask.count() * 256 - sp->depth * 1;
- if ( sp
- && sp->allSlavesSearching
- && sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT
- && available_to(Threads[i]))
+ if (score < bestScore)
{
- // Compute the recursive split points chain size
- int level = -1;
- for (SplitPoint* spp = Threads[i]->activeSplitPoint; spp; spp = spp->parentSplitPoint)
- level++;
-
- int score = level * 256 * 256 + sp->slavesCount * 256 - sp->depth * 1;
-
- if (score < bestScore)
- {
- bestSp = sp;
- bestThread = i;
- bestScore = score;
- }
+ bestSp = sp;
+ bestThread = Threads[i];
+ bestScore = score;
}
}
+ }
- if (bestSp)
- {
- sp = bestSp;
-
- // Recheck the conditions under lock protection
- Threads.mutex.lock();
- sp->mutex.lock();
+ if (bestSp)
+ {
+ sp = bestSp;
- if ( sp->allSlavesSearching
- && sp->slavesCount < MAX_SLAVES_PER_SPLITPOINT
- && available_to(Threads[bestThread]))
- {
- sp->slavesMask.set(idx);
- sp->slavesCount++;
- activeSplitPoint = sp;
- searching = true;
- }
+ // Recheck the conditions under lock protection
+ Threads.mutex.lock();
+ sp->mutex.lock();
- sp->mutex.unlock();
- Threads.mutex.unlock();
+ if ( sp->allSlavesSearching
+ && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
+ && available_to(bestThread))
+ {
+ sp->slavesMask.set(idx);
+ activeSplitPoint = sp;
+ searching = true;
}
+
+ sp->mutex.unlock();
+ Threads.mutex.unlock();
}
}
// Loop across all split points and sum accumulated SplitPoint nodes plus
// all the currently active positions nodes.
for (size_t i = 0; i < Threads.size(); ++i)
- for (int j = 0; j < Threads[i]->splitPointsSize; ++j)
+ for (size_t j = 0; j < Threads[i]->splitPointsSize; ++j)
{
SplitPoint& sp = Threads[i]->splitPoints[j];