diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-03-31 03:50:05 +0200 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-06-27 17:36:03 +0200 |
commit | 19165cd859dcbb1f7d5e2c74c831e5196c2d1c41 (patch) | |
tree | b8ce4801d50c76b77daae42d9ca9841a2ac82778 /src/core/hle/kernel/svc.cpp | |
parent | SingleCore: Improve Cycle timing Behavior and replace mutex in global scheduler for spinlock. (diff) | |
download | yuzu-19165cd859dcbb1f7d5e2c74c831e5196c2d1c41.tar yuzu-19165cd859dcbb1f7d5e2c74c831e5196c2d1c41.tar.gz yuzu-19165cd859dcbb1f7d5e2c74c831e5196c2d1c41.tar.bz2 yuzu-19165cd859dcbb1f7d5e2c74c831e5196c2d1c41.tar.lz yuzu-19165cd859dcbb1f7d5e2c74c831e5196c2d1c41.tar.xz yuzu-19165cd859dcbb1f7d5e2c74c831e5196c2d1c41.tar.zst yuzu-19165cd859dcbb1f7d5e2c74c831e5196c2d1c41.zip |
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index c47fa9167..37e893c84 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -333,13 +333,21 @@ static ResultCode SendSyncRequest(Core::System& system, Handle handle) { thread->SetStatus(ThreadStatus::WaitIPC); session->SendSyncRequest(SharedFrom(thread), system.Memory()); } + if (thread->HasHLECallback()) { Handle event_handle = thread->GetHLETimeEvent(); if (event_handle != InvalidHandle) { auto& time_manager = system.Kernel().TimeManager(); time_manager.UnscheduleTimeEvent(event_handle); } - thread->InvokeHLECallback(SharedFrom(thread)); + + { + SchedulerLock lock(system.Kernel()); + auto* sync_object = thread->GetHLESyncObject(); + sync_object->RemoveWaitingThread(SharedFrom(thread)); + + thread->InvokeHLECallback(SharedFrom(thread)); + } } return thread->GetSignalingResult(); |