diff options
author | Subv <subv2112@gmail.com> | 2018-04-20 19:01:14 +0200 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-04-21 04:04:25 +0200 |
commit | e81a2080ebf9712231dd29c081141780ffd46cfb (patch) | |
tree | b93d23dde3c3a0e86edeb44a1c1f1e18ac839bd6 /src/core/hle/kernel/thread.h | |
parent | Merge pull request #367 from lioncash/clamp (diff) | |
download | yuzu-e81a2080ebf9712231dd29c081141780ffd46cfb.tar yuzu-e81a2080ebf9712231dd29c081141780ffd46cfb.tar.gz yuzu-e81a2080ebf9712231dd29c081141780ffd46cfb.tar.bz2 yuzu-e81a2080ebf9712231dd29c081141780ffd46cfb.tar.lz yuzu-e81a2080ebf9712231dd29c081141780ffd46cfb.tar.xz yuzu-e81a2080ebf9712231dd29c081141780ffd46cfb.tar.zst yuzu-e81a2080ebf9712231dd29c081141780ffd46cfb.zip |
Diffstat (limited to 'src/core/hle/kernel/thread.h')
-rw-r--r-- | src/core/hle/kernel/thread.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index dbf47e269..a3a6e6a64 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -43,6 +43,7 @@ enum ThreadStatus { THREADSTATUS_WAIT_IPC, ///< Waiting for the reply from an IPC request THREADSTATUS_WAIT_SYNCH_ANY, ///< Waiting due to WaitSynch1 or WaitSynchN with wait_all = false THREADSTATUS_WAIT_SYNCH_ALL, ///< Waiting due to WaitSynchronizationN with wait_all = true + THREADSTATUS_WAIT_MUTEX, ///< Waiting due to an ArbitrateLock/WaitProcessWideKey svc THREADSTATUS_DORMANT, ///< Created but not yet made ready THREADSTATUS_DEAD ///< Run to completion, or forcefully terminated }; @@ -217,7 +218,10 @@ public: // passed to WaitSynchronization1/N. std::vector<SharedPtr<WaitObject>> wait_objects; - VAddr wait_address; ///< If waiting on an AddressArbiter, this is the arbitration address + // If waiting on a ConditionVariable, this is the ConditionVariable address + VAddr condvar_wait_address; + VAddr mutex_wait_address; ///< If waiting on a Mutex, this is the mutex address + Handle wait_handle; ///< The handle used to wait for the mutex. std::string name; |