Some renaming in split()

Naming suggested by jundery.

No functional change.
This commit is contained in:
Marco Costalba
2013-02-04 19:48:56 +01:00
parent 6560e4cc5b
commit b8c5ea869c
4 changed files with 25 additions and 25 deletions

View File

@@ -147,7 +147,7 @@ void Thread::wait_for(volatile const bool& b) {
bool Thread::cutoff_occurred() const {
for (SplitPoint* sp = activeSplitPoint; sp; sp = sp->parent)
for (SplitPoint* sp = activeSplitPoint; sp; sp = sp->parentSplitPoint)
if (sp->cutoff)
return true;
@@ -258,17 +258,17 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
assert(bestValue > -VALUE_INFINITE);
assert(depth >= Threads.minimumSplitDepth);
Thread* master = pos.this_thread();
Thread* thisThread = pos.this_thread();
assert(master->searching);
assert(master->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);
assert(thisThread->searching);
assert(thisThread->splitPointsSize < MAX_SPLITPOINTS_PER_THREAD);
// Pick the next available split point from the split point stack
SplitPoint& sp = master->splitPoints[master->splitPointsSize];
SplitPoint& sp = thisThread->splitPoints[thisThread->splitPointsSize];
sp.master = master;
sp.parent = master->activeSplitPoint;
sp.slavesMask = 1ULL << master->idx;
sp.masterThread = thisThread;
sp.parentSplitPoint = thisThread->activeSplitPoint;
sp.slavesMask = 1ULL << thisThread->idx;
sp.depth = depth;
sp.bestMove = *bestMove;
sp.threatMove = threatMove;
@@ -276,7 +276,7 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
sp.beta = beta;
sp.nodeType = nodeType;
sp.bestValue = bestValue;
sp.mp = &mp;
sp.movePicker = &mp;
sp.moveCount = moveCount;
sp.pos = &pos;
sp.nodes = 0;
@@ -289,13 +289,13 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
mutex.lock();
sp.mutex.lock();
master->splitPointsSize++;
master->activeSplitPoint = &sp;
thisThread->splitPointsSize++;
thisThread->activeSplitPoint = &sp;
size_t slavesCnt = 1; // Master is always included
for (size_t i = 0; i < threads.size() && !Fake; ++i)
if (threads[i]->is_available_to(master) && ++slavesCnt <= maxThreadsPerSplitPoint)
if (threads[i]->is_available_to(thisThread) && ++slavesCnt <= maxThreadsPerSplitPoint)
{
sp.slavesMask |= 1ULL << threads[i]->idx;
threads[i]->activeSplitPoint = &sp;
@@ -312,11 +312,11 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
// their work at this split point.
if (slavesCnt > 1 || Fake)
{
master->Thread::idle_loop(); // Force a call to base class idle_loop()
thisThread->Thread::idle_loop(); // Force a call to base class idle_loop()
// 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(!master->searching);
assert(!thisThread->searching);
}
// We have returned from the idle loop, which means that all threads are
@@ -325,9 +325,9 @@ Value ThreadPool::split(Position& pos, Stack* ss, Value alpha, Value beta,
mutex.lock();
sp.mutex.lock();
master->searching = true;
master->splitPointsSize--;
master->activeSplitPoint = sp.parent;
thisThread->searching = true;
thisThread->splitPointsSize--;
thisThread->activeSplitPoint = sp.parentSplitPoint;
pos.set_nodes_searched(pos.nodes_searched() + sp.nodes);
*bestMove = sp.bestMove;