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
This commit is contained in:
parent
aa01c57ae9
commit
6643673f28
8 changed files with 75 additions and 78 deletions
|
@ -26,7 +26,7 @@ public:
|
|||
Handle lock_thread; ///< Handle to thread that currently has mutex
|
||||
std::string name; ///< Name of mutex (optional)
|
||||
|
||||
ResultVal<bool> Wait(unsigned index) override;
|
||||
ResultVal<bool> Wait(bool wait_thread) override;
|
||||
ResultVal<bool> Acquire() override;
|
||||
};
|
||||
|
||||
|
@ -156,10 +156,10 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
|
|||
return handle;
|
||||
}
|
||||
|
||||
ResultVal<bool> Mutex::Wait(unsigned index) {
|
||||
if (locked) {
|
||||
ResultVal<bool> Mutex::Wait(bool wait_thread) {
|
||||
if (locked && wait_thread) {
|
||||
AddWaitingThread(GetCurrentThread());
|
||||
Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_MUTEX, this, index);
|
||||
Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_MUTEX, this);
|
||||
}
|
||||
|
||||
return MakeResult<bool>(locked);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue