citra/citra-canary
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-canary.git synced 2024-12-24 00:45:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2338 from wwylele/fix-dead

Browse source 
Kernel: remove object's waiting thread if it is dead
This commit is contained in:
Sebastian Valle 2016-12-16 08:48:22 -05:00 committed by GitHub
parent cda7210fad 4c9b80cee3
commit d25a37966d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/kernel/kernel.cpp
View file

@ -35,7 +35,8 @@ void WaitObject::RemoveWaitingThread(Thread* thread) {
SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() { SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() {
// Remove the threads that are ready or already running from our waitlist // Remove the threads that are ready or already running from our waitlist
boost::range::remove_erase_if(waiting_threads, [](const SharedPtr<Thread>& thread) { boost::range::remove_erase_if(waiting_threads, [](const SharedPtr<Thread>& thread) {
return thread->status == THREADSTATUS_RUNNING || thread->status == THREADSTATUS_READY; return thread->status == THREADSTATUS_RUNNING || thread->status == THREADSTATUS_READY ||
thread->status == THREADSTATUS_DEAD;
}); });
// TODO(Subv): This call should be performed inside the loop below to check if an object can be // TODO(Subv): This call should be performed inside the loop below to check if an object can be