Kernel/Threads: A thread waking up by timeout from a WaitProcessWideKey may already have an assigned lock owner.

This situation may happen like so:
Thread 1 with low priority calls WaitProcessWideKey with timeout.
Thread 2 with high priority calls WaitProcessWideKey without timeout.
Thread 3 calls SignalProcessWideKey
- Thread 2 acquires the lock and awakens.
- Thread 1 can't acquire the lock and is put to sleep with the lock owner being Thread 2.
Thread 1's timeout expires, with the lock owner still being set to Thread 2.
merge-requests/60/head
Subv 2018-06-02 14:06:35 +07:00
parent bbbe34429e
commit 9cd87a6352
1 changed files with 5 additions and 2 deletions

@ -133,8 +133,11 @@ static void ThreadWakeupCallback(u64 thread_handle, int cycles_late) {
auto lock_owner = thread->lock_owner; auto lock_owner = thread->lock_owner;
// Threads waking up by timeout from WaitProcessWideKey do not perform priority inheritance // Threads waking up by timeout from WaitProcessWideKey do not perform priority inheritance
// and don't have a lock owner. // and don't have a lock owner unless SignalProcessWideKey was called first and the thread
ASSERT(lock_owner == nullptr); // wasn't awakened due to the mutex already being acquired.
if (lock_owner) {
lock_owner->RemoveMutexWaiter(thread);
}
} }
if (resume) if (resume)