i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/condition_variable: Acquire and release locks in the right order.

Browse Source 
Should fix #15223.
This commit is contained in:
Augustin Cavalier
2019-08-03 20:31:41 -04:00
parent 2f1e2ae469
commit 287428271d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/condition_variable.cpp
+3 -1
View File
@@ -325,11 +325,12 @@ ConditionVariable::_NotifyLocked(bool all, status_t result)
// entering Wait() and acquiring its own lock, and then acquiring ours. // entering Wait() and acquiring its own lock, and then acquiring ours.
while (ConditionVariableEntry* entry = fEntries.RemoveHead()) { while (ConditionVariableEntry* entry = fEntries.RemoveHead()) {
release_spinlock(&fLock); release_spinlock(&fLock);
acquire_spinlock(&entry->fLock);
SpinLocker _(entry->fLock);
entry->fVariable = NULL; entry->fVariable = NULL;
if (entry->fWaitStatus <= 0) { if (entry->fWaitStatus <= 0) {
release_spinlock(&entry->fLock);
acquire_spinlock(&fLock); acquire_spinlock(&fLock);
continue; continue;
} }
@@ -341,6 +342,7 @@ ConditionVariable::_NotifyLocked(bool all, status_t result)
entry->fWaitStatus = result; entry->fWaitStatus = result;
release_spinlock(&entry->fLock);
acquire_spinlock(&fLock); acquire_spinlock(&fLock);
if (!all) if (!all)