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

[orbis-kernel] Fixup do_lock_normal (_umtx_op)

Browse source 
Incorrect wait condition
This commit is contained in:
Ivan Chikish 2023-07-10 16:35:08 +03:00
parent 14f76e2a91
commit 6b7474e34e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
orbis-kernel/src/umtx.cpp
View file

@ -77,6 +77,7 @@ void log_class_string<umutex_lock_mode>::format(std::string &out,
static ErrorCode do_lock_normal(Thread *thread, ptr<umutex> m, uint flags,
std::uint64_t ut, umutex_lock_mode mode) {
ORBIS_LOG_NOTICE(__FUNCTION__, m, flags, ut, mode);
ErrorCode error = {};
while (true) {
int owner = m->owner.load(std::memory_order_acquire);
@ -107,10 +108,9 @@ static ErrorCode do_lock_normal(Thread *thread, ptr<umutex> m, uint flags,
auto [chain, key, lock] = g_context.getUmtxChain1(thread->tproc->pid, m);
auto node = chain.enqueue(key, thread);
bool ok = m->owner.compare_exchange_strong(owner, owner | kUmutexContested);
if (ok && node->second.thr == thread) {
if (m->owner.compare_exchange_strong(owner, owner | kUmutexContested)) {
node->second.cv.wait(chain.mtx, ut);
if (node->second.thr)
if (node->second.thr == thread)
error = ErrorCode::TIMEDOUT;
}
if (node->second.thr == thread)