diff options
author | bunnei <bunneidev@gmail.com> | 2015-01-18 01:27:46 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-01-21 19:11:47 -0500 |
commit | 6643673f28b9273149fc945849a13ed832e9ef33 (patch) | |
tree | 026410cf5b0b57d350ac979380307991646e546c /src/core/hle/kernel/thread.h | |
parent | aa01c57ae9d73e41b65d37860ca6fbb91caba33a (diff) |
WaitSynchronizationN: Refactor to fix several bugs
- Separate wait checking from waiting the current thread
- Resume thread when wait_all=true only if all objects are available at once
- Set output to correct wait object index when there are duplicate handles
Diffstat (limited to 'src/core/hle/kernel/thread.h')
-rw-r--r-- | src/core/hle/kernel/thread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 9faf89c1..dff6bbae 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -70,7 +70,7 @@ public: inline bool IsSuspended() const { return (status & THREADSTATUS_SUSPEND) != 0; } inline bool IsIdle() const { return idle; } - ResultVal<bool> Wait(unsigned index) override; + ResultVal<bool> Wait(bool wait_thread) override; ResultVal<bool> Acquire() override; s32 GetPriority() const { return current_priority; } @@ -117,7 +117,7 @@ public: s32 processor_id; WaitType wait_type; - std::vector<std::pair<SharedPtr<WaitObject>, unsigned>> wait_objects; + std::vector<SharedPtr<WaitObject>> wait_objects; VAddr wait_address; std::string name; |