- lock_grab(&MPLock);
-
- // Test with lock held to avoid races with wake_sleeping_thread()
- for (i = 0; sp && i < ActiveThreads && !sp->slaves[i]; i++) {}
- allFinished = (i == ActiveThreads);
-
- // Retest sleep conditions under lock protection
- if ( AllThreadsShouldExit
- || allFinished
- || !( threadID >= ActiveThreads
- || threads[threadID].state == THREAD_INITIALIZING
- || (threads[threadID].state == THREAD_AVAILABLE && (!sp || UseSleepingMaster))))
+ assert(!sp || useSleepingThreads);
+ assert(threadID != 0 || useSleepingThreads);
+
+ if (threads[threadID].state == THREAD_INITIALIZING)
+ threads[threadID].state = THREAD_AVAILABLE;
+
+ // Grab the lock to avoid races with wake_sleeping_thread()
+ lock_grab(&sleepLock[threadID]);
+
+ // If we are master and all slaves have finished do not go to sleep
+ for (i = 0; sp && i < activeThreads && !sp->slaves[i]; i++) {}
+ allFinished = (i == activeThreads);
+
+ if (allFinished || allThreadsShouldExit)