summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-17 06:05:13 +0200
committerbunnei <bunneidev@gmail.com>2018-07-17 06:26:23 +0200
commit170e19d4eab455ad4d28ad72799cc6687692392d (patch)
treeab2c73b4cd29b32e6c79c0274d65fe7cee7f6070 /src/core/hle/kernel
parentMerge pull request #669 from lioncash/dynarmic (diff)
downloadyuzu-170e19d4eab455ad4d28ad72799cc6687692392d.tar
yuzu-170e19d4eab455ad4d28ad72799cc6687692392d.tar.gz
yuzu-170e19d4eab455ad4d28ad72799cc6687692392d.tar.bz2
yuzu-170e19d4eab455ad4d28ad72799cc6687692392d.tar.lz
yuzu-170e19d4eab455ad4d28ad72799cc6687692392d.tar.xz
yuzu-170e19d4eab455ad4d28ad72799cc6687692392d.tar.zst
yuzu-170e19d4eab455ad4d28ad72799cc6687692392d.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/hle_ipc.cpp10
-rw-r--r--src/core/hle/kernel/hle_ipc.h4
2 files changed, 11 insertions, 3 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 2532dd450..b1e6f565b 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -29,7 +29,8 @@ void SessionRequestHandler::ClientDisconnected(SharedPtr<ServerSession> server_s
SharedPtr<Event> HLERequestContext::SleepClientThread(SharedPtr<Thread> thread,
const std::string& reason, u64 timeout,
- WakeupCallback&& callback) {
+ WakeupCallback&& callback,
+ Kernel::SharedPtr<Kernel::Event> event) {
// Put the client thread to sleep until the wait event is signaled or the timeout expires.
thread->wakeup_callback =
@@ -41,7 +42,12 @@ SharedPtr<Event> HLERequestContext::SleepClientThread(SharedPtr<Thread> thread,
return true;
};
- auto event = Kernel::Event::Create(Kernel::ResetType::OneShot, "HLE Pause Event: " + reason);
+ if (!event) {
+ // Create event if not provided
+ event = Kernel::Event::Create(Kernel::ResetType::OneShot, "HLE Pause Event: " + reason);
+ }
+
+ event->Clear();
thread->status = THREADSTATUS_WAIT_HLE_EVENT;
thread->wait_objects = {event};
event->AddWaitingThread(thread);
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 376263eac..c6eca7404 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -118,10 +118,12 @@ public:
* @param callback Callback to be invoked when the thread is resumed. This callback must write
* the entire command response once again, regardless of the state of it before this function
* was called.
+ * @param event Event to use to wake up the thread. If unspecified, an event will be created.
* @returns Event that when signaled will resume the thread and call the callback function.
*/
SharedPtr<Event> SleepClientThread(SharedPtr<Thread> thread, const std::string& reason,
- u64 timeout, WakeupCallback&& callback);
+ u64 timeout, WakeupCallback&& callback,
+ Kernel::SharedPtr<Kernel::Event> event = nullptr);
void ParseCommandBuffer(u32_le* src_cmdbuf, bool incoming);