Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kernel/Mutex: Update a mutex priority when a thread stops waiting on it.

Browse source
This commit is contained in:
Subv 2017-01-02 13:53:10 -05:00
parent 7abf185390
commit b6a0355568
5 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/core/hle/kernel/mutex.cpp
View file

@ -28,6 +28,23 @@ static void UpdateThreadPriority(Thread* thread) {
thread->SetPriority(best_priority);
}
/**
* Elevate the mutex priority to the best priority
* among the priorities of all its waiting threads.
*/
static void UpdateMutexPriority(Mutex* mutex) {
s32 best_priority = THREADPRIO_LOWEST;
for (auto& waiter : mutex->GetWaitingThreads()) {
if (waiter->current_priority < best_priority)
best_priority = waiter->current_priority;
}
if (best_priority != mutex->priority) {
mutex->priority = best_priority;
UpdateThreadPriority(mutex->holding_thread.get());
}
}
void ReleaseThreadMutexes(Thread* thread) {
for (auto& mtx : thread->held_mutexes) {
mtx->lock_count = 0;
@ -93,20 +110,12 @@ void Mutex::Release() {
void Mutex::AddWaitingThread(SharedPtr<Thread> thread) {
WaitObject::AddWaitingThread(thread);
UpdateMutexPriority(this);
}
// Elevate the mutex priority to the best priority
// among the priorities of all its waiting threads.
s32 best_priority = THREADPRIO_LOWEST;
for (auto& waiter : GetWaitingThreads()) {
if (waiter->current_priority < best_priority)
best_priority = waiter->current_priority;
}
if (best_priority != priority) {
priority = best_priority;
UpdateThreadPriority(holding_thread.get());
}
void Mutex::RemoveWaitingThread(Thread* thread) {
WaitObject::RemoveWaitingThread(thread);
UpdateMutexPriority(this);
}
} // namespace