Improve comments in SMP code

No functional change.
This commit is contained in:
Marco Costalba
2015-02-20 12:13:09 +01:00
parent a6f873cd8d
commit 7ff965eebf
3 changed files with 10 additions and 9 deletions

View File

@@ -1517,9 +1517,9 @@ void Thread::idle_loop() {
// Pointer 'this_sp' is not null only if we are called from split(), and not // Pointer 'this_sp' is not null only if we are called from split(), and not
// at the thread creation. This means we are the split point's master. // at the thread creation. This means we are the split point's master.
SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : nullptr; SplitPoint* this_sp = activeSplitPoint;
assert(!this_sp || (this_sp->masterThread == this && searching)); assert(!this_sp || (this_sp->master == this && searching));
while (!exit) while (!exit)
{ {
@@ -1529,6 +1529,7 @@ void Thread::idle_loop() {
Threads.mutex.lock(); Threads.mutex.lock();
assert(activeSplitPoint); assert(activeSplitPoint);
SplitPoint* sp = activeSplitPoint; SplitPoint* sp = activeSplitPoint;
Threads.mutex.unlock(); Threads.mutex.unlock();
@@ -1567,11 +1568,11 @@ void Thread::idle_loop() {
// Wake up the master thread so to allow it to return from the idle // Wake up the master thread so to allow it to return from the idle
// loop in case we are the last slave of the split point. // loop in case we are the last slave of the split point.
if ( this != sp->masterThread if (this != sp->master && sp->slavesMask.none())
&& sp->slavesMask.none())
{ {
assert(!sp->masterThread->searching); assert(!sp->master->searching);
sp->masterThread->notify_one();
sp->master->notify_one();
} }
// After releasing the lock we can't access any SplitPoint related data // After releasing the lock we can't access any SplitPoint related data
@@ -1638,7 +1639,7 @@ void Thread::idle_loop() {
} }
} }
// Grab the lock to avoid races with Thread::notify_one() // Avoid races with notify_one() fired from last slave of the split point
std::unique_lock<std::mutex> lk(mutex); std::unique_lock<std::mutex> lk(mutex);
// If we are master and all slaves have finished then exit idle_loop // If we are master and all slaves have finished then exit idle_loop

View File

@@ -145,7 +145,7 @@ void Thread::split(Position& pos, Stack* ss, Value alpha, Value beta, Value* bes
// Pick and init the next available split point // Pick and init the next available split point
SplitPoint& sp = splitPoints[splitPointsSize]; SplitPoint& sp = splitPoints[splitPointsSize];
sp.masterThread = this; sp.master = this;
sp.parentSplitPoint = activeSplitPoint; sp.parentSplitPoint = activeSplitPoint;
sp.slavesMask = 0, sp.slavesMask.set(idx); sp.slavesMask = 0, sp.slavesMask.set(idx);
sp.depth = depth; sp.depth = depth;

View File

@@ -46,7 +46,7 @@ struct SplitPoint {
// Const data after split point has been setup // Const data after split point has been setup
const Position* pos; const Position* pos;
Search::Stack* ss; Search::Stack* ss;
Thread* masterThread; Thread* master;
Depth depth; Depth depth;
Value beta; Value beta;
int nodeType; int nodeType;