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

[orbis-kernel] Fix umtx_wait

Browse source
This commit is contained in:
Ivan Chikish 2023-07-11 07:35:55 +03:00
parent aa5adc7b6d
commit 646b4f2b46
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ orbis::SysResult orbis::sys__umtx_op(Thread *thread, ptr<void> obj, sint op,
ORBIS_LOG_TRACE(__FUNCTION__, obj, op, val, uaddr1, uaddr2);
if (reinterpret_cast<std::uintptr_t>(obj) - 0x10000 > 0xff'fffe'ffff)
return ErrorCode::FAULT;
auto with_timeout = [&](auto op) -> orbis::ErrorCode {
auto with_timeout = [&](auto op, bool loop = true) -> orbis::ErrorCode {
timespec *ts = nullptr;
timespec timeout{};
if (uaddr2 != nullptr) {
@ -43,19 +43,23 @@ orbis::SysResult orbis::sys__umtx_op(Thread *thread, ptr<void> obj, sint op,
ts = &timeout;
}
__uint128_t usec = timeout.sec;
auto start = std::chrono::steady_clock::now();
if (!ts) {
if (!loop)
return op(-1);
while (true) {
if (auto r = op(-1); r != ErrorCode::TIMEDOUT)
return r;
}
} else {
__uint128_t usec = timeout.sec;
usec *= 1000'000;
usec += (timeout.nsec + 999) / 1000;
if (usec >= UINT64_MAX)
usec = -2;
if (!loop)
return op(usec);
auto start = std::chrono::steady_clock::now();
std::uint64_t udiff = 0;
while (true) {
if (auto r = op(usec - udiff); r != ErrorCode::TIMEDOUT)
@ -77,7 +81,8 @@ orbis::SysResult orbis::sys__umtx_op(Thread *thread, ptr<void> obj, sint op,
return umtx_unlock_umtx(thread, (ptr<umtx>)obj, val);
case 2: {
return with_timeout(
[&](std::uint64_t ut) { return umtx_wait(thread, obj, val, ut); });
[&](std::uint64_t ut) { return umtx_wait(thread, obj, val, ut); },
false);
}
case 3:
return umtx_wake(thread, obj, val);

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

@ -56,11 +56,23 @@ orbis::ErrorCode orbis::umtx_wait(Thread *thread, ptr<void> addr, ulong id,
auto [chain, key, lock] = g_context.getUmtxChain0(thread->tproc->pid, addr);
auto node = chain.enqueue(key, thread);
ErrorCode result = {};
// TODO: this is inaccurate with timeout as FreeBsd 9.1 only checks id once
if (reinterpret_cast<ptr<std::atomic<ulong>>>(addr)->load() == id) {
node->second.cv.wait(chain.mtx, ut);
if (node->second.thr == thread)
result = ErrorCode::TIMEDOUT;
if (ut + 1 == 0) {
node->second.cv.wait(chain.mtx);
} else {
auto start = std::chrono::steady_clock::now();
std::uint64_t udiff = 0;
while (true) {
node->second.cv.wait(chain.mtx, ut - udiff);
if (node->second.thr != thread)
break;
udiff = (std::chrono::steady_clock::now() - start).count() / 1000;
if (udiff >= ut) {
result = ErrorCode::TIMEDOUT;
break;
}
}
}
}
if (node->second.thr == thread)
chain.erase(node);