1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00

Use range-based-for in late join

No functional change.
This commit is contained in:
Marco Costalba 2015-02-20 10:49:51 +01:00
parent 40548c9153
commit a6f873cd8d

View file

@ -1585,24 +1585,24 @@ void Thread::idle_loop() {
Thread* bestThread = NULL; Thread* bestThread = NULL;
int bestScore = INT_MAX; int bestScore = INT_MAX;
for (size_t i = 0; i < Threads.size(); ++i) for (Thread* th : Threads)
{ {
const size_t size = Threads[i]->splitPointsSize; // Local copy const size_t size = th->splitPointsSize; // Local copy
sp = size ? &Threads[i]->splitPoints[size - 1] : nullptr; sp = size ? &th->splitPoints[size - 1] : nullptr;
if ( sp if ( sp
&& sp->allSlavesSearching && sp->allSlavesSearching
&& sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT && sp->slavesMask.count() < MAX_SLAVES_PER_SPLITPOINT
&& available_to(Threads[i])) && available_to(th))
{ {
assert(this != Threads[i]); assert(this != th);
assert(!(this_sp && this_sp->slavesMask.none())); assert(!(this_sp && this_sp->slavesMask.none()));
assert(Threads.size() > 2); assert(Threads.size() > 2);
// Prefer to join to SP with few parents to reduce the probability // 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. // that a cut-off occurs above us, and hence we waste our work.
int level = -1; int level = -1;
for (SplitPoint* spp = Threads[i]->activeSplitPoint; spp; spp = spp->parentSplitPoint) for (SplitPoint* spp = th->activeSplitPoint; spp; spp = spp->parentSplitPoint)
level++; level++;
int score = level * 256 * 256 + (int)sp->slavesMask.count() * 256 - sp->depth * 1; int score = level * 256 * 256 + (int)sp->slavesMask.count() * 256 - sp->depth * 1;
@ -1610,7 +1610,7 @@ void Thread::idle_loop() {
if (score < bestScore) if (score < bestScore)
{ {
bestSp = sp; bestSp = sp;
bestThread = Threads[i]; bestThread = th;
bestScore = score; bestScore = score;
} }
} }