summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/thread.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-06-18 00:07:15 +0200
committerbunnei <bunneidev@gmail.com>2015-06-18 00:07:15 +0200
commit2e16edbc56c51265250269dd2d5e8b7b71335656 (patch)
tree7634b833a4c5a647a172f29cff281920ce0f07ed /src/core/hle/kernel/thread.h
parentMerge pull request #864 from linkmauve/gl-info (diff)
parentkernel: Fix svcWaitSynch to always acquire requested wait objects. (diff)
downloadyuzu-2e16edbc56c51265250269dd2d5e8b7b71335656.tar
yuzu-2e16edbc56c51265250269dd2d5e8b7b71335656.tar.gz
yuzu-2e16edbc56c51265250269dd2d5e8b7b71335656.tar.bz2
yuzu-2e16edbc56c51265250269dd2d5e8b7b71335656.tar.lz
yuzu-2e16edbc56c51265250269dd2d5e8b7b71335656.tar.xz
yuzu-2e16edbc56c51265250269dd2d5e8b7b71335656.tar.zst
yuzu-2e16edbc56c51265250269dd2d5e8b7b71335656.zip
Diffstat (limited to 'src/core/hle/kernel/thread.h')
-rw-r--r--src/core/hle/kernel/thread.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 2c65419c3..b8160bb2c 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -96,12 +96,6 @@ public:
u32 GetThreadId() const { return thread_id; }
/**
- * Release an acquired wait object
- * @param wait_object WaitObject to release
- */
- void ReleaseWaitObject(WaitObject* wait_object);
-
- /**
* Resumes a thread from waiting
*/
void ResumeFromWait();
@@ -152,6 +146,8 @@ public:
s32 tls_index; ///< Index of the Thread Local Storage of the thread
+ bool waitsynch_waited; ///< Set to true if the last svcWaitSynch call caused the thread to wait
+
/// Mutexes currently held by this thread, which will be released when it exits.
boost::container::flat_set<SharedPtr<Mutex>> held_mutexes;
@@ -163,12 +159,12 @@ public:
std::string name;
+ /// Handle used as userdata to reference this object when inserting into the CoreTiming queue.
+ Handle callback_handle;
+
private:
Thread();
~Thread() override;
-
- /// Handle used as userdata to reference this object when inserting into the CoreTiming queue.
- Handle callback_handle;
};
/**