notsoyuzu
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HLE_IPC: Correct HLE Event behavior on timeout.

This commit is contained in:
Fernando Sahmkow 2020-03-30 21:50:05 -04:00
parent 7e2ce2f7f4
commit 19165cd859
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/hle/kernel/hle_ipc.cpp
View File

@ -70,6 +70,7 @@ std::shared_ptr<WritableEvent> HLERequestContext::SleepClientThread(
}); });
const auto readable_event{writable_event->GetReadableEvent()}; const auto readable_event{writable_event->GetReadableEvent()};
writable_event->Clear(); writable_event->Clear();
thread->SetHLESyncObject(readable_event.get());
thread->SetStatus(ThreadStatus::WaitHLEEvent); thread->SetStatus(ThreadStatus::WaitHLEEvent);
thread->SetSynchronizationResults(nullptr, RESULT_TIMEOUT); thread->SetSynchronizationResults(nullptr, RESULT_TIMEOUT);
readable_event->AddWaitingThread(thread); readable_event->AddWaitingThread(thread);

10
src/core/hle/kernel/svc.cpp
View File

@ -333,13 +333,21 @@ static ResultCode SendSyncRequest(Core::System& system, Handle handle) {
thread->SetStatus(ThreadStatus::WaitIPC); thread->SetStatus(ThreadStatus::WaitIPC);
session->SendSyncRequest(SharedFrom(thread), system.Memory()); session->SendSyncRequest(SharedFrom(thread), system.Memory());
} }
if (thread->HasHLECallback()) { if (thread->HasHLECallback()) {
Handle event_handle = thread->GetHLETimeEvent(); Handle event_handle = thread->GetHLETimeEvent();
if (event_handle != InvalidHandle) { if (event_handle != InvalidHandle) {
auto& time_manager = system.Kernel().TimeManager(); auto& time_manager = system.Kernel().TimeManager();
time_manager.UnscheduleTimeEvent(event_handle); 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(); return thread->GetSignalingResult();

9
src/core/hle/kernel/thread.h
View File

@ -489,10 +489,18 @@ public:
hle_time_event = time_event; hle_time_event = time_event;
} }
void SetHLESyncObject(SynchronizationObject* object) {
hle_object = object;
}
Handle GetHLETimeEvent() const { Handle GetHLETimeEvent() const {
return hle_time_event; return hle_time_event;
} }
SynchronizationObject* GetHLESyncObject() const {
return hle_object;
}
void InvalidateWakeupCallback() { void InvalidateWakeupCallback() {
SetWakeupCallback(nullptr); SetWakeupCallback(nullptr);
} }
@ -698,6 +706,7 @@ private:
/// Callback for HLE Events /// Callback for HLE Events
HLECallback hle_callback; HLECallback hle_callback;
Handle hle_time_event; Handle hle_time_event;
SynchronizationObject* hle_object;
Scheduler* scheduler = nullptr; Scheduler* scheduler = nullptr;