From 170d7078507745fee4c8952aa5888108b2b76b91 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Thu, 29 Nov 2018 09:14:12 -0500
Subject: hle_ipc: Refactor SleepClientThread to avoid ReadableEvent

---
 src/core/hle/kernel/hle_ipc.cpp        | 6 +++---
 src/core/hle/kernel/hle_ipc.h          | 4 +---
 src/core/hle/kernel/kernel.cpp         | 2 --
 src/core/hle/kernel/writable_event.cpp | 4 ++++
 src/core/hle/kernel/writable_event.h   | 2 ++
 5 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/core/hle/kernel')

diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 21fda42d6..61ce7d7e4 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -39,7 +39,7 @@ void SessionRequestHandler::ClientDisconnected(const SharedPtr<ServerSession>& s
 
 SharedPtr<WritableEvent> HLERequestContext::SleepClientThread(
     SharedPtr<Thread> thread, const std::string& reason, u64 timeout, WakeupCallback&& callback,
-    SharedPtr<WritableEvent> writable_event, SharedPtr<ReadableEvent> readable_event) {
+    SharedPtr<WritableEvent> writable_event) {
     // Put the client thread to sleep until the wait event is signaled or the timeout expires.
     thread->SetWakeupCallback([context = *this, callback](
                                   ThreadWakeupReason reason, SharedPtr<Thread> thread,
@@ -51,14 +51,14 @@ SharedPtr<WritableEvent> HLERequestContext::SleepClientThread(
     });
 
     auto& kernel = Core::System::GetInstance().Kernel();
-    if (!writable_event || !readable_event) {
+    if (!writable_event) {
         // Create event if not provided
         const auto pair = WritableEvent::CreateEventPair(kernel, Kernel::ResetType::OneShot,
                                                          "HLE Pause Event: " + reason);
         writable_event = pair.writable;
-        readable_event = pair.readable;
     }
 
+    const auto readable_event{writable_event->GetReadableEvent()};
     writable_event->Clear();
     thread->SetStatus(ThreadStatus::WaitHLEEvent);
     thread->SetWaitObjects({readable_event});
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 557940f11..e5c0610cd 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -122,13 +122,11 @@ public:
      * was called.
      * @param writable_event Event to use to wake up the thread. If unspecified, an event will be
      * created.
-     * @param readable_event Event to be bound to the thread to wake up upon.
      * @returns Event that when signaled will resume the thread and call the callback function.
      */
     SharedPtr<WritableEvent> SleepClientThread(SharedPtr<Thread> thread, const std::string& reason,
                                                u64 timeout, WakeupCallback&& callback,
-                                               SharedPtr<WritableEvent> writable_event = nullptr,
-                                               SharedPtr<ReadableEvent> readable_event = nullptr);
+                                               SharedPtr<WritableEvent> writable_event = nullptr);
 
     /// Populates this context with data from the requesting process/thread.
     ResultCode PopulateFromIncomingCommandBuffer(const HandleTable& handle_table,
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 21d7f3483..e441c5bc6 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -17,11 +17,9 @@
 #include "core/hle/kernel/handle_table.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/process.h"
-#include "core/hle/kernel/readable_event.h"
 #include "core/hle/kernel/resource_limit.h"
 #include "core/hle/kernel/thread.h"
 #include "core/hle/kernel/timer.h"
-#include "core/hle/kernel/writable_event.h"
 #include "core/hle/lock.h"
 #include "core/hle/result.h"
 
diff --git a/src/core/hle/kernel/writable_event.cpp b/src/core/hle/kernel/writable_event.cpp
index 27d7ff734..a58ea6ec8 100644
--- a/src/core/hle/kernel/writable_event.cpp
+++ b/src/core/hle/kernel/writable_event.cpp
@@ -29,6 +29,10 @@ EventPair WritableEvent::CreateEventPair(KernelCore& kernel, ResetType reset_typ
     return {std::move(readable_event), std::move(writable_event)};
 }
 
+SharedPtr<ReadableEvent> WritableEvent::GetReadableEvent() const {
+    return readable;
+}
+
 ResetType WritableEvent::GetResetType() const {
     return readable->reset_type;
 }
diff --git a/src/core/hle/kernel/writable_event.h b/src/core/hle/kernel/writable_event.h
index 4357d1b9f..fc57d18d7 100644
--- a/src/core/hle/kernel/writable_event.h
+++ b/src/core/hle/kernel/writable_event.h
@@ -44,6 +44,8 @@ public:
         return HANDLE_TYPE;
     }
 
+    SharedPtr<ReadableEvent> GetReadableEvent() const;
+
     ResetType GetResetType() const;
 
     void Signal();
-- 
cgit v1.2.3