diff options
author | Sebastian Valle <subv2112@gmail.com> | 2017-01-05 18:55:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-05 18:55:01 +0100 |
commit | f20d872643654c574f73a263f032613046900f07 (patch) | |
tree | 021284c18034d053c81928fa19d2efb6658451fb /src/core/hle/kernel/mutex.h | |
parent | Merge pull request #2407 from jroweboy/nightly-deploy (diff) | |
parent | Kernel: Add some asserts to enforce the invariants in the scheduler. (diff) | |
download | yuzu-f20d872643654c574f73a263f032613046900f07.tar yuzu-f20d872643654c574f73a263f032613046900f07.tar.gz yuzu-f20d872643654c574f73a263f032613046900f07.tar.bz2 yuzu-f20d872643654c574f73a263f032613046900f07.tar.lz yuzu-f20d872643654c574f73a263f032613046900f07.tar.xz yuzu-f20d872643654c574f73a263f032613046900f07.tar.zst yuzu-f20d872643654c574f73a263f032613046900f07.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/mutex.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index 53c3dc1f1..c57adf400 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h @@ -35,17 +35,22 @@ public: } int lock_count; ///< Number of times the mutex has been acquired + u32 priority; ///< The priority of the mutex, used for priority inheritance. std::string name; ///< Name of mutex (optional) SharedPtr<Thread> holding_thread; ///< Thread that has acquired the mutex - bool ShouldWait() override; - void Acquire() override; - /** - * Acquires the specified mutex for the specified thread - * @param thread Thread that will acquire the mutex + * Elevate the mutex priority to the best priority + * among the priorities of all its waiting threads. */ - void Acquire(SharedPtr<Thread> thread); + void UpdatePriority(); + + bool ShouldWait(Thread* thread) const override; + void Acquire(Thread* thread) override; + + void AddWaitingThread(SharedPtr<Thread> thread) override; + void RemoveWaitingThread(Thread* thread) override; + void Release(); private: |