fix #755: a race condition cousing a deadlock

This reverts a JobSystem optimization that attempted to avoid signaling
a condition when there was no waiters. Unfortunately, there was a
race that caused the the signaling thread to miss that the waiter flag
was set, thus not signaling.
This commit is contained in:
Mathias Agopian
2019-01-29 15:09:54 -08:00
committed by Mathias Agopian
parent 7be3994c96
commit ae6ab66af4
2 changed files with 2 additions and 4 deletions

View File

@@ -321,7 +321,7 @@ void JobSystem::finish(Job* job) noexcept {
std::atomic_thread_fence(std::memory_order_acquire);
#endif
// no more work, destroy this job and notify its the parent
notify = notify || job->hasWaiter.load();
notify = true;
Job* const parent = job->parent == 0x7FFF ? nullptr : &storage[job->parent];
decRef(job);
job = parent;
@@ -427,7 +427,6 @@ void JobSystem::waitAndRelease(Job*& job) noexcept {
// test if job has completed first, to possibly avoid taking the lock
if (!hasJobCompleted(job)) {
std::unique_lock<Mutex> lock(mWaiterLock);
job->hasWaiter.store(true);
while (!hasJobCompleted(job) && !exitRequested()) {
mWaiterCondition.wait(lock);
}