Fix race condition where idle_loop() gets called from Split()

SplitPoint member slavesMask wasn't read under lock

No functional change.
This commit is contained in:
jundery
2013-03-03 23:44:46 -07:00
committed by Marco Costalba
parent 3ce43c20de
commit d165d5af91
2 changed files with 12 additions and 1 deletions
+7 -1
View File
@@ -1622,7 +1622,7 @@ void Thread::idle_loop() {
// Pointer 'this_sp' is not null only if we are called from split(), and not
// at the thread creation. So it means we are the split point's master.
const SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : NULL;
SplitPoint* this_sp = splitPointsSize ? activeSplitPoint : NULL;
assert(!this_sp || (this_sp->masterThread == this && searching));
@@ -1630,6 +1630,9 @@ void Thread::idle_loop() {
// their work at this split point, return from the idle loop.
while (!this_sp || this_sp->slavesMask)
{
if (this_sp)
this_sp->mutex.unlock();
// If we are not searching, wait for a condition to be signaled instead of
// wasting CPU time polling for work.
while ((!searching && Threads.sleepWhileIdle) || exit)
@@ -1721,6 +1724,9 @@ void Thread::idle_loop() {
// unsafe because if we are exiting there is a chance are already freed.
sp->mutex.unlock();
}
if(this_sp)
this_sp->mutex.lock();
}
}