diff options
author | bunnei <bunneidev@gmail.com> | 2015-02-10 04:17:20 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-02-10 04:17:20 +0100 |
commit | 848795f3834c30695208e86c5bbebf6c71a57d96 (patch) | |
tree | 2cc5b3092cf41215bac17c6ddaf3bdec985b7adb /src/core/hle/kernel/mutex.h | |
parent | Merge pull request #550 from lioncash/ftoui (diff) | |
parent | Mutex: Locks should be recursive. (diff) | |
download | yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.gz yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.bz2 yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.lz yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.xz yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.tar.zst yuzu-848795f3834c30695208e86c5bbebf6c71a57d96.zip |
Diffstat (limited to 'src/core/hle/kernel/mutex.h')
-rw-r--r-- | src/core/hle/kernel/mutex.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index 548403614..d6d5328be 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h @@ -30,8 +30,7 @@ public: static const HandleType HANDLE_TYPE = HandleType::Mutex; HandleType GetHandleType() const override { return HANDLE_TYPE; } - bool initial_locked; ///< Initial lock state when mutex was created - bool locked; ///< Current locked state + int lock_count; ///< Number of times the mutex has been acquired std::string name; ///< Name of mutex (optional) SharedPtr<Thread> holding_thread; ///< Thread that has acquired the mutex |