bool Thread::cutoff_occurred() const {
- for (SplitPoint* sp = splitPoint; sp; sp = sp->parent)
+ for (SplitPoint* sp = curSplitPoint; sp; sp = sp->parent)
if (sp->cutoff)
return true;
// Make a local copy to be sure doesn't become zero under our feet while
// testing next condition and so leading to an out of bound access.
- int sp_count = activeSplitPoints;
+ int spCnt = splitPointsCnt;
// No active split points means that the thread is available as a slave for any
// other thread otherwise apply the "helpful master" concept if possible.
- return !sp_count || (splitPoints[sp_count - 1].slavesMask & (1ULL << master));
+ return !spCnt || (splitPoints[spCnt - 1].slavesMask & (1ULL << master));
}
lock_init(threads[i].sleepLock);
cond_init(threads[i].sleepCond);
- for (int j = 0; j < MAX_ACTIVE_SPLIT_POINTS; j++)
+ for (int j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++)
lock_init(threads[i].splitPoints[j].lock);
}
lock_destroy(threads[i].sleepLock);
cond_destroy(threads[i].sleepCond);
- for (int j = 0; j < MAX_ACTIVE_SPLIT_POINTS; j++)
+ for (int j = 0; j < MAX_SPLITPOINTS_PER_THREAD; j++)
lock_destroy(threads[i].splitPoints[j].lock);
}
int master = pos.thread();
Thread& masterThread = threads[master];
- if (masterThread.activeSplitPoints >= MAX_ACTIVE_SPLIT_POINTS)
+ if (masterThread.splitPointsCnt >= MAX_SPLITPOINTS_PER_THREAD)
return bestValue;
// Pick the next available split point from the split point stack
- SplitPoint* sp = &masterThread.splitPoints[masterThread.activeSplitPoints];
+ SplitPoint* sp = &masterThread.splitPoints[masterThread.splitPointsCnt++];
- sp->parent = masterThread.splitPoint;
+ sp->parent = masterThread.curSplitPoint;
sp->master = master;
sp->cutoff = false;
sp->slavesMask = 1ULL << master;
assert(masterThread.is_searching);
+ masterThread.curSplitPoint = sp;
int slavesCnt = 0;
// Try to allocate available threads and ask them to start searching setting
if (threads[i].is_available_to(master))
{
sp->slavesMask |= 1ULL << i;
- threads[i].splitPoint = sp;
+ threads[i].curSplitPoint = sp;
threads[i].is_searching = true; // Slave leaves idle_loop()
if (useSleepingThreads)
break;
}
- masterThread.splitPoint = sp;
- masterThread.activeSplitPoints++;
-
lock_release(splitLock);
lock_release(sp->lock);
// the thread will return from the idle loop when all slaves have finished
// their work at this split point.
if (slavesCnt || Fake)
+ {
masterThread.idle_loop(sp);
+ // 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(!masterThread.is_searching);
+ }
+
// We have returned from the idle loop, which means that all threads are
- // finished. Note that setting is_searching and decreasing activeSplitPoints is
+ // finished. Note that setting is_searching and decreasing splitPointsCnt is
// done under lock protection to avoid a race with Thread::is_available_to().
lock_grab(sp->lock); // To protect sp->nodes
lock_grab(splitLock);
masterThread.is_searching = true;
- masterThread.activeSplitPoints--;
- masterThread.splitPoint = sp->parent;
+ masterThread.splitPointsCnt--;
+ masterThread.curSplitPoint = sp->parent;
pos.set_nodes_searched(pos.nodes_searched() + sp->nodes);
lock_release(splitLock);