RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-30 20:34:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[orbis-kernel] shared_cv fixup

Browse source 
notify_one should work, notify_all probably doesn't.
This commit is contained in:
Ivan Chikish 2023-07-07 04:58:59 +03:00
parent 9aafaea7f0
commit 99f520491c
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
orbis-kernel/src/utils/SharedCV.cpp
View file

@ -67,16 +67,13 @@ void shared_cv::impl_wake(shared_mutex &mutex, int _count) noexcept {
unsigned do_wake = _m_locks == 0;
if (auto r = syscall(SYS_futex, &m_value, FUTEX_CMP_REQUEUE, do_wake,
&mutex, _count - do_wake, _old);
r > 0) {
if (mutex.is_free()) // Avoid deadlock (TODO: proper fix?)
syscall(SYS_futex, &mutex, FUTEX_WAKE, 1, nullptr, 0, 0);
if (!is_one) // Keep awaking waiters
return impl_wake(mutex, INT_MAX);
} else if (r == EAGAIN) {
// Retry if something has changed (TODO: is it necessary?)
r < _count) {
// Keep awaking waiters
return impl_wake(mutex, is_one ? 1 : INT_MAX);
} else if (r < 0)
std::abort(); // Unknown error
} else if (mutex.is_free()) {
// Avoid deadlock (TODO: proper fix?)
syscall(SYS_futex, &mutex, FUTEX_WAKE, 1, nullptr, 0, 0);
}
}
}
} // namespace orbis::utils