RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2025-12-06 07:12:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[orbis-kernel] umtx_op: robust waiting

Browse source
This commit is contained in:
Ivan Chikish 2023-07-13 17:54:23 +03:00
parent 42ff87545a
commit 0bf03555ef
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
orbis-kernel/src/sys/sys_umtx.cpp
View file

@ -104,10 +104,12 @@ orbis::SysResult orbis::sys__umtx_op(Thread *thread, ptr<void> obj, sint op,
(ptr<uint32_t>)uaddr1); (ptr<uint32_t>)uaddr1);
case 8: { case 8: {
return with_timeout([&](std::uint64_t ut) { return with_timeout(
return umtx_cv_wait(thread, (ptr<ucond>)obj, (ptr<umutex>)uaddr1, ut, [&](std::uint64_t ut) {
val); return umtx_cv_wait(thread, (ptr<ucond>)obj, (ptr<umutex>)uaddr1, ut,
}); val);
},
false);
} }
case 9: case 9:

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

@ -71,7 +71,11 @@ orbis::ErrorCode orbis::umtx_wait(Thread *thread, ptr<void> addr, ulong id,
val = reinterpret_cast<ptr<std::atomic<ulong>>>(addr)->load(); val = reinterpret_cast<ptr<std::atomic<ulong>>>(addr)->load();
if (val == id) { if (val == id) {
if (ut + 1 == 0) { if (ut + 1 == 0) {
node->second.cv.wait(chain.mtx); while (true) {
node->second.cv.wait(chain.mtx);
if (node->second.thr != thread)
break;
}
} else { } else {
auto start = std::chrono::steady_clock::now(); auto start = std::chrono::steady_clock::now();
std::uint64_t udiff = 0; std::uint64_t udiff = 0;
@ -162,8 +166,9 @@ static ErrorCode do_lock_normal(Thread *thread, ptr<umutex> m, uint flags,
auto node = chain.enqueue(key, thread); auto node = chain.enqueue(key, thread);
if (m->owner.compare_exchange_strong(owner, owner | kUmutexContested)) { if (m->owner.compare_exchange_strong(owner, owner | kUmutexContested)) {
node->second.cv.wait(chain.mtx, ut); node->second.cv.wait(chain.mtx, ut);
if (node->second.thr == thread) if (node->second.thr == thread) {
error = ErrorCode::TIMEDOUT; error = ErrorCode::TIMEDOUT;
}
} }
if (node->second.thr == thread) if (node->second.thr == thread)
chain.erase(node); chain.erase(node);
@ -298,7 +303,11 @@ orbis::ErrorCode orbis::umtx_cv_wait(Thread *thread, ptr<ucond> cv,
ErrorCode result = umtx_unlock_umutex(thread, m); ErrorCode result = umtx_unlock_umutex(thread, m);
if (result == ErrorCode{}) { if (result == ErrorCode{}) {
if (ut + 1 == 0) { if (ut + 1 == 0) {
node->second.cv.wait(chain.mtx, ut); while (true) {
node->second.cv.wait(chain.mtx, ut);
if (node->second.thr != thread)
break;
}
} else { } else {
auto start = std::chrono::steady_clock::now(); auto start = std::chrono::steady_clock::now();
std::uint64_t udiff = 0; std::uint64_t udiff = 0;