Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-06-14 14:43:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Equeue: fix WaitEqueue assert on nullptr (#2994)
Some checks are pending
Build and Release / windows-sdl (push) Blocked by required conditions
Details
Build and Release / linux-sdl-gcc (push) Blocked by required conditions
Details
Build and Release / reuse (push) Waiting to run
Details
Build and Release / clang-format (push) Waiting to run
Details
Build and Release / get-info (push) Waiting to run
Details
Build and Release / windows-qt (push) Blocked by required conditions
Details
Build and Release / macos-sdl (push) Blocked by required conditions
Details
Build and Release / macos-qt (push) Blocked by required conditions
Details
Build and Release / linux-sdl (push) Blocked by required conditions
Details
Build and Release / linux-qt (push) Blocked by required conditions
Details
Build and Release / linux-qt-gcc (push) Blocked by required conditions
Details
Build and Release / pre-release (push) Blocked by required conditions
Details

Browse source 
* fix

* fix infinite call of waitforsmalltimer

* fix wrong nullptr check

* add comment back

* fix discrepancy

* remove assert

---------

Co-authored-by: georgemoralis <giorgosmrls@gmail.com>
This commit is contained in:
Fire Cube 2025-05-27 23:47:54 +02:00 • committed by GitHub
parent 139a253edc
commit e0309a4b01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/core/libraries/kernel/equeue.cpp
View file

@ -187,7 +187,8 @@ int EqueueInternal::WaitForSmallTimer(SceKernelEvent* ev, int num, u32 micros) {
ASSERT(num == 1); ASSERT(num == 1);
auto curr_clock = std::chrono::steady_clock::now(); auto curr_clock = std::chrono::steady_clock::now();
const auto wait_end_us = curr_clock + std::chrono::microseconds{micros}; const auto wait_end_us = (micros == 0) ? std::chrono::steady_clock::time_point::max()
: curr_clock + std::chrono::microseconds{micros};
do { do {
curr_clock = std::chrono::steady_clock::now(); curr_clock = std::chrono::steady_clock::now();
@ -266,23 +267,26 @@ int PS4_SYSV_ABI sceKernelWaitEqueue(SceKernelEqueue eq, SceKernelEvent* ev, int
return ORBIS_KERNEL_ERROR_EINVAL; return ORBIS_KERNEL_ERROR_EINVAL;
} }
// When the timeout is nullptr, we wait indefinitely
if (eq->HasSmallTimer()) { if (eq->HasSmallTimer()) {
ASSERT(timo && *timo); if (timo == nullptr) {
*out = eq->WaitForSmallTimer(ev, num, *timo); *out = eq->WaitForSmallTimer(ev, num, 0);
} else { } else if (*timo == 0) {
if (timo == nullptr) { // wait until an event arrives without timing out
*out = eq->WaitForEvents(ev, num, 0);
}
if (timo != nullptr) {
// Only events that have already arrived at the time of this function call can be // Only events that have already arrived at the time of this function call can be
// received // received
if (*timo == 0) { *out = eq->GetTriggeredEvents(ev, num);
*out = eq->GetTriggeredEvents(ev, num); } else {
} else { *out = eq->WaitForSmallTimer(ev, num, *timo);
// Wait until an event arrives with timing out }
*out = eq->WaitForEvents(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
*out = eq->GetTriggeredEvents(ev, num);
} else {
*out = eq->WaitForEvents(ev, num, *timo);
} }
} }