wait_object: Refactor to allow waking up a single thread.
This commit is contained in:
parent
bc77a7580e
commit
0f6fbdb963
2 changed files with 30 additions and 17 deletions
|
@ -67,25 +67,32 @@ SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() {
|
||||||
return candidate;
|
return candidate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WaitObject::WakeupWaitingThread(SharedPtr<Thread> thread) {
|
||||||
|
if (!thread)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!thread->IsSleepingOnWaitAll()) {
|
||||||
|
Acquire(thread.get());
|
||||||
|
} else {
|
||||||
|
for (auto& object : thread->wait_objects) {
|
||||||
|
object->Acquire(thread.get());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Invoke the wakeup callback before clearing the wait objects
|
||||||
|
if (thread->wakeup_callback)
|
||||||
|
thread->wakeup_callback(ThreadWakeupReason::Signal, thread, this);
|
||||||
|
|
||||||
|
for (auto& object : thread->wait_objects)
|
||||||
|
object->RemoveWaitingThread(thread.get());
|
||||||
|
thread->wait_objects.clear();
|
||||||
|
|
||||||
|
thread->ResumeFromWait();
|
||||||
|
}
|
||||||
|
|
||||||
void WaitObject::WakeupAllWaitingThreads() {
|
void WaitObject::WakeupAllWaitingThreads() {
|
||||||
while (auto thread = GetHighestPriorityReadyThread()) {
|
while (auto thread = GetHighestPriorityReadyThread()) {
|
||||||
if (!thread->IsSleepingOnWaitAll()) {
|
WakeupWaitingThread(thread);
|
||||||
Acquire(thread.get());
|
|
||||||
} else {
|
|
||||||
for (auto& object : thread->wait_objects) {
|
|
||||||
object->Acquire(thread.get());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Invoke the wakeup callback before clearing the wait objects
|
|
||||||
if (thread->wakeup_callback)
|
|
||||||
thread->wakeup_callback(ThreadWakeupReason::Signal, thread, this);
|
|
||||||
|
|
||||||
for (auto& object : thread->wait_objects)
|
|
||||||
object->RemoveWaitingThread(thread.get());
|
|
||||||
thread->wait_objects.clear();
|
|
||||||
|
|
||||||
thread->ResumeFromWait();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,12 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual void WakeupAllWaitingThreads();
|
virtual void WakeupAllWaitingThreads();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wakes up a single thread waiting on this object.
|
||||||
|
* @param thread Thread that is waiting on this object to wakeup.
|
||||||
|
*/
|
||||||
|
void WakeupWaitingThread(SharedPtr<Thread> thread);
|
||||||
|
|
||||||
/// Obtains the highest priority thread that is ready to run from this object's waiting list.
|
/// Obtains the highest priority thread that is ready to run from this object's waiting list.
|
||||||
SharedPtr<Thread> GetHighestPriorityReadyThread();
|
SharedPtr<Thread> GetHighestPriorityReadyThread();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue