Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/condition_variable: Adjust notified count and wait-status returning.

Browse Source 
* If we received a wait status, always return with it.

 * Only count those entries for which we set the wait-status as
   having been notified.

In conjunction with the prior commit, this fixes some rare deadlocks
that could occur with timeouts or signals.
This commit is contained in:
Augustin Cavalier 2023-08-04 15:16:55 -04:00
parent 798b773393
commit 6d3065508f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/system/kernel/condition_variable.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright 2007-2011, Ingo Weinhold, ingo_weinhold@gmx.de.
* Copyright 2019, Haiku, Inc. All rights reserved.
* Copyright 2019-2023, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
@ -198,6 +198,11 @@ ConditionVariableEntry::Wait(uint32 flags, bigtime_t timeout)
error = thread_block();
_RemoveFromVariable();
// We need to always return the actual wait status, if we received one.
if (fWaitStatus <= 0)
return fWaitStatus;
return error;
}
@ -417,9 +422,10 @@ ConditionVariable::_NotifyLocked(bool all, status_t result)
// and spin while waiting for us to do so.
if (lastWaitStatus == STATUS_WAITING)
thread_unblock_locked(thread, result);
notified++;
}
notified++;
if (!all)
break;
}