yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #496 from Subv/waitprocesswidekey_timeout 

Kernel/Threads: A thread waking up by timeout from a WaitProcessWideKey may already have an assigned lock owner.
This commit is contained in:
bunnei 2018-06-03 11:15:49 -04:00 committed by GitHub
parent 0d64ddc6dd 9cd87a6352
commit 63270e588b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/hle/kernel/thread.cpp
View File

@ -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)