mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-22 10:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

equeue: Move small timer check to WaitForEvents. (#3000)

Browse Source
This commit is contained in:
squidbus 2025-05-28 09:54:47 -07:00 committed by GitHub
parent e0309a4b01
commit 95f04b746d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/libraries/kernel/equeue.cpp
View File

@ -98,6 +98,11 @@ bool EqueueInternal::RemoveEvent(u64 id, s16 filter) {
}
int EqueueInternal::WaitForEvents(SceKernelEvent* ev, int num, u32 micros) {
if (HasSmallTimer()) {
// If a small timer is set, just wait for it to expire.
return WaitForSmallTimer(ev, num, micros);
}
int count = 0;
const auto predicate = [&] {
@ -267,28 +272,16 @@ int PS4_SYSV_ABI sceKernelWaitEqueue(SceKernelEqueue eq, SceKernelEvent* ev, int
return ORBIS_KERNEL_ERROR_EINVAL;
}
if (timo == nullptr) {
// When the timeout is nullptr, we wait indefinitely
if (eq->HasSmallTimer()) {
if (timo == nullptr) {
*out = eq->WaitForSmallTimer(ev, num, 0);
} else if (*timo == 0) {
// Only events that have already arrived at the time of this function call can be
// received
*out = eq->GetTriggeredEvents(ev, num);
} else {
*out = eq->WaitForSmallTimer(ev, num, *timo);
}
} else {
if (timo == nullptr) {
*out = eq->WaitForEvents(ev, num, 0);
} else if (*timo == 0) {
// Only events that have already arrived at the time of this function call can be
// received
// Only events that have already arrived at the time of this function call can be received
*out = eq->GetTriggeredEvents(ev, num);
} else {
// Wait for up to the specified timeout value
*out = eq->WaitForEvents(ev, num, *timo);
}
}
if (*out == 0) {
return ORBIS_KERNEL_ERROR_ETIMEDOUT;