diff options
| author | bunnei <bunneidev@gmail.com> | 2019-11-23 13:23:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-23 13:23:23 -0500 |
| commit | 6e4d46908af55e16afca1aa05aeab47e20ab49f5 (patch) | |
| tree | ce0f6fd75e88b90325ab2673964c2b07234bb3d0 /src | |
| parent | bedc903c656faa0d39aaf7352eaecf2153a634e8 (diff) | |
| parent | 7d16b2d2ddd170a24cc09f258fbf2e56f34b009d (diff) | |
Merge pull request #3130 from FernandoS27/cancel-sync
Kernel: Correct Cancel Synchronization.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 7 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 9 |
3 files changed, 19 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index c63a9ba8bb..b2cef3be99 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -505,6 +505,11 @@ static ResultCode WaitSynchronization(Core::System& system, Handle* index, VAddr return RESULT_TIMEOUT; } + if (thread->IsSyncCancelled()) { + thread->SetSyncCancelled(false); + return ERR_SYNCHRONIZATION_CANCELED; + } + for (auto& object : objects) { object->AddWaitingThread(thread); } diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index ee7531f2d5..ab0e82ac2a 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -120,8 +120,11 @@ void Thread::ResumeFromWait() { } void Thread::CancelWait() { - ASSERT(GetStatus() == ThreadStatus::WaitSynch); - ClearWaitObjects(); + if (GetSchedulingStatus() != ThreadSchedStatus::Paused) { + is_sync_cancelled = true; + return; + } + is_sync_cancelled = false; SetWaitSynchronizationResult(ERR_SYNCHRONIZATION_CANCELED); ResumeFromWait(); } diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index c9870873d5..25a6ed234e 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -440,6 +440,14 @@ public: is_running = value; } + bool IsSyncCancelled() const { + return is_sync_cancelled; + } + + void SetSyncCancelled(bool value) { + is_sync_cancelled = value; + } + private: explicit Thread(KernelCore& kernel); ~Thread() override; @@ -524,6 +532,7 @@ private: u32 scheduling_state = 0; bool is_running = false; + bool is_sync_cancelled = false; std::string name; }; |