Properly remove a thread from its wait_objects' waitlist when it is awoken by a timeout.

This commit is contained in:
Subv 2016-12-10 13:29:31 -05:00
parent 17b29d8865
commit 406907d570
3 changed files with 11 additions and 2 deletions

View file

@ -38,6 +38,11 @@ SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() {
return thread->status == THREADSTATUS_RUNNING || thread->status == THREADSTATUS_READY;
});
// TODO(Subv): This call should be performed inside the loop below to check if an object can be
// acquired by a particular thread. This is useful for things like recursive locking of Mutexes.
if (ShouldWait())
return nullptr;
Thread* candidate = nullptr;
s32 candidate_priority = THREADPRIO_LOWEST + 1;
@ -67,7 +72,7 @@ void WaitObject::WakeupAllWaitingThreads() {
thread->wait_set_output = false;
}
} else {
for (auto object : thread->wait_objects) {
for (auto& object : thread->wait_objects) {
object->Acquire();
object->RemoveWaitingThread(thread.get());
}