From 19165cd859dcbb1f7d5e2c74c831e5196c2d1c41 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Mon, 30 Mar 2020 21:50:05 -0400
Subject: [PATCH] HLE_IPC: Correct HLE Event behavior on timeout.
---
src/core/hle/kernel/hle_ipc.cpp | 1 +
src/core/hle/kernel/svc.cpp | 10 +++++++++-
src/core/hle/kernel/thread.h | 9 +++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index e74d91670d..9277b5d08b 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -70,6 +70,7 @@ std::shared_ptr<WritableEvent> HLERequestContext::SleepClientThread(
});
const auto readable_event{writable_event->GetReadableEvent()};
writable_event->Clear();
+ thread->SetHLESyncObject(readable_event.get());
thread->SetStatus(ThreadStatus::WaitHLEEvent);
thread->SetSynchronizationResults(nullptr, RESULT_TIMEOUT);
readable_event->AddWaitingThread(thread);
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index c47fa91671..37e893c841 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();
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index f651d78229..61963148db 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -489,10 +489,18 @@ public:
hle_time_event = time_event;
}
+ void SetHLESyncObject(SynchronizationObject* object) {
+ hle_object = object;
+ }
+
Handle GetHLETimeEvent() const {
return hle_time_event;
}
+ SynchronizationObject* GetHLESyncObject() const {
+ return hle_object;
+ }
+
void InvalidateWakeupCallback() {
SetWakeupCallback(nullptr);
}
@@ -698,6 +706,7 @@ private:
/// Callback for HLE Events
HLECallback hle_callback;
Handle hle_time_event;
+ SynchronizationObject* hle_object;
Scheduler* scheduler = nullptr;