diff options
author | bunnei <bunneidev@gmail.com> | 2015-04-03 18:40:16 -0400 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-04-09 19:06:39 -0400 |
commit | 9c3419ebccf046e0a123e0516ea134547393e451 (patch) | |
tree | 24073b71ade88e5f99db439b824228bdc6b2737d /src/core/hle/kernel/mutex.cpp | |
parent | 7b9f428b23e1761e7b6c177d2e8eb9219ac6b7f6 (diff) |
Kernel: Implemented priority inheritance for mutexes.
Diffstat (limited to 'src/core/hle/kernel/mutex.cpp')
-rw-r--r-- | src/core/hle/kernel/mutex.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index be2c4970..ebc9e79d 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp @@ -56,7 +56,15 @@ SharedPtr<Mutex> Mutex::Create(bool initial_locked, std::string name) { } bool Mutex::ShouldWait() { - return lock_count > 0 && holding_thread != GetCurrentThread();; + auto thread = GetCurrentThread(); + bool wait = lock_count > 0 && holding_thread != thread; + + // If the holding thread of the mutex is lower priority than this thread, that thread should + // temporarily inherit this thread's priority + if (wait && thread->current_priority < holding_thread->current_priority) + holding_thread->BoostPriority(thread->current_priority); + + return wait; } void Mutex::Acquire() { |