[PR #2994] [MERGED] Equeue: fix WaitEqueue assert on nullptr #3132

New issue

Closed

opened 2026-02-27 22:02:34 +03:00 by kerem · 0 comments

kerem commented

2026-02-27 22:02:34 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/shadps4-emu/shadPS4/pull/2994
Author: @Fire-Cube
Created: 5/26/2025
Status: ✅ Merged
Merged: 5/27/2025
Merged by: @squidbus

Base: main ← Head: equeue_timo_assert

📝 Commits (8)

10680c5 fix
54839ed fix infinite call of waitforsmalltimer
45da348 fix wrong nullptr check
2bd553a add comment back
d852565 Merge branch 'main' into equeue_timo_assert
71df5d0 fix discrepancy
85c2a2d Merge branch 'equeue_timo_assert' of https://github.com/Fire-Cube/shadPS4 into equeue_timo_assert
9e73c4d remove assert

📊 Changes

1 file changed (+17 additions, -13 deletions)

View changed files

📝 src/core/libraries/kernel/equeue.cpp (+17 -13)

📄 Description

On real hardware nullptr is not a problem and based on RE WaitEqueue simply passes 0 to kqueue if timeout is nullptr

Pls test again before merge

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/shadps4-emu/shadPS4/pull/2994 **Author:** [@Fire-Cube](https://github.com/Fire-Cube) **Created:** 5/26/2025 **Status:** ✅ Merged **Merged:** 5/27/2025 **Merged by:** [@squidbus](https://github.com/squidbus) **Base:** `main` ← **Head:** `equeue_timo_assert` --- ### 📝 Commits (8) - [`10680c5`](https://github.com/shadps4-emu/shadPS4/commit/10680c57f18d23b41cf9f6cca05cbf61c9b6bfc7) fix - [`54839ed`](https://github.com/shadps4-emu/shadPS4/commit/54839ed5899f7eeeaf28fb018ccde7081ad5def3) fix infinite call of waitforsmalltimer - [`45da348`](https://github.com/shadps4-emu/shadPS4/commit/45da348676335afb9399f611775cb673155da167) fix wrong nullptr check - [`2bd553a`](https://github.com/shadps4-emu/shadPS4/commit/2bd553a64620536ad0a4a954d373d8824ac6111e) add comment back - [`d852565`](https://github.com/shadps4-emu/shadPS4/commit/d852565872e493ff4fad9fa6bc8e88e00d9721c5) Merge branch 'main' into equeue_timo_assert - [`71df5d0`](https://github.com/shadps4-emu/shadPS4/commit/71df5d0398e1efbb862981eb6ee54b823bea4b3b) fix discrepancy - [`85c2a2d`](https://github.com/shadps4-emu/shadPS4/commit/85c2a2dd58c31ec71f3af114a679bab42d007077) Merge branch 'equeue_timo_assert' of https://github.com/Fire-Cube/shadPS4 into equeue_timo_assert - [`9e73c4d`](https://github.com/shadps4-emu/shadPS4/commit/9e73c4d9f1e66527010b9847197f98b239571866) remove assert ### 📊 Changes **1 file changed** (+17 additions, -13 deletions) <details> <summary>View changed files</summary> 📝 `src/core/libraries/kernel/equeue.cpp` (+17 -13) </details> ### 📄 Description On real hardware nullptr is not a problem and based on RE WaitEqueue simply passes 0 to kqueue if timeout is nullptr Pls test again before merge --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>