Skip to content

fix(kernel): let a pending HRTIMER wake a blocking equeue wait #1081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Woesch-Nich wants to merge 1 commit into from
Closed

fix(kernel): let a pending HRTIMER wake a blocking equeue wait #1081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion core/libs/prx/libkernel/Equeue/Equeue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,17 @@ int KernelEqueuePrivate::WaitForEvents(KernelEvent* ev, int num, uint32_t micros
return SCE_KERNEL_ERROR_EBADF;
}
if (micros == 0) {
m_cond.Wait(lock);
// A pending high-resolution timer must be able to wake a blocking wait
// (kqueue semantics): the dispatcher parks here with no timeout and must
// still see its one-shot HRTIMER expire.
uint32_t timerWait = 0;
if (NextTimerWaitMicros(MonotonicNs(), &timerWait)) {
const std::uint64_t timerDeadline =
TimedWait::NowNanos() + static_cast<std::uint64_t>(timerWait) * 1000ULL;
m_cond.WaitUntil(lock, timerDeadline);
} else {
m_cond.Wait(lock);
}
} else {
uint32_t timerWait = 0;
const bool hasTimer = NextTimerWaitMicros(MonotonicNs(), &timerWait);
Expand Down