hrev53336 adds 1 changeset to branch 'master'
old head: 37eda488be1c9fee242e8e4bf6ca644dd13441d8
new head: 2f1e2ae469ccb1657cc506db06de8de33b89b874
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=2f1e2ae469cc+%5E37eda488be1c
----------------------------------------------------------------------------
2f1e2ae469cc: kernelland_emu: Adapt to new ConditionVariable API.
This could use some optimizations, but it's only used by
userlandfs for now.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53336
Commit: 2f1e2ae469ccb1657cc506db06de8de33b89b874
URL: https://git.haiku-os.org/haiku/commit/?id=2f1e2ae469cc
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Aug 3 15:46:05 2019 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 5 deletions(-)
.../add-ons/kernel/kernelland_emu/condition_variable.cpp | 8 +++-----
----------------------------------------------------------------------------
diff --git a/src/tests/add-ons/kernel/kernelland_emu/condition_variable.cpp
b/src/tests/add-ons/kernel/kernelland_emu/condition_variable.cpp
index 09e6244a51..fa1b3041bd 100644
--- a/src/tests/add-ons/kernel/kernelland_emu/condition_variable.cpp
+++ b/src/tests/add-ons/kernel/kernelland_emu/condition_variable.cpp
@@ -118,12 +118,9 @@ ConditionVariableEntry::Wait(const void* object, uint32
flags,
inline void
-ConditionVariableEntry::AddToVariable(ConditionVariable* variable)
+ConditionVariableEntry::AddToLockedVariable(ConditionVariable* variable)
{
fThread = get_current_thread();
-
- MutexLocker _(sConditionVariablesLock);
-
fVariable = variable;
fWaitStatus = STATUS_ADDED;
fVariable->fEntries.Add(this);
@@ -180,7 +177,8 @@ ConditionVariable::Unpublish()
void
ConditionVariable::Add(ConditionVariableEntry* entry)
{
- entry->AddToVariable(this);
+ MutexLocker _(sConditionVariablesLock);
+ entry->AddToLockedVariable(this);
}
