From e6fe40428c3260d551ac5c795651e2efcfdfc0ea Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Wed, 2 Nov 2022 20:21:32 -0400
Subject: service_thread: register service threads to the logical owner process

---
 src/core/hle/kernel/service_thread.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'src/core/hle/kernel/service_thread.cpp')

diff --git a/src/core/hle/kernel/service_thread.cpp b/src/core/hle/kernel/service_thread.cpp
index c8fe42537..7a85be77f 100644
--- a/src/core/hle/kernel/service_thread.cpp
+++ b/src/core/hle/kernel/service_thread.cpp
@@ -36,11 +36,12 @@ public:
 private:
     KernelCore& kernel;
 
-    std::jthread m_thread;
+    std::jthread m_host_thread;
     std::mutex m_session_mutex;
     std::map<KServerSession*, std::shared_ptr<SessionRequestManager>> m_sessions;
     KEvent* m_wakeup_event;
     KProcess* m_process;
+    KThread* m_thread;
     std::atomic<bool> m_shutdown_requested;
     const std::string m_service_name;
 };
@@ -132,7 +133,7 @@ void ServiceThread::Impl::SessionClosed(KServerSession* server_session,
 void ServiceThread::Impl::LoopProcess() {
     Common::SetCurrentThreadName(m_service_name.c_str());
 
-    kernel.RegisterHostThread();
+    kernel.RegisterHostThread(m_thread);
 
     while (!m_shutdown_requested.load()) {
         WaitAndProcessImpl();
@@ -160,7 +161,7 @@ ServiceThread::Impl::~Impl() {
     // Shut down the processing thread.
     m_shutdown_requested.store(true);
     m_wakeup_event->Signal();
-    m_thread.join();
+    m_host_thread.join();
 
     // Lock mutex.
     m_session_mutex.lock();
@@ -177,6 +178,9 @@ ServiceThread::Impl::~Impl() {
     m_wakeup_event->GetReadableEvent().Close();
     m_wakeup_event->Close();
 
+    // Close thread.
+    m_thread->Close();
+
     // Close process.
     m_process->Close();
 }
@@ -199,11 +203,19 @@ ServiceThread::Impl::Impl(KernelCore& kernel_, const std::string& service_name)
     // Commit the event reservation.
     event_reservation.Commit();
 
-    // Register the event.
-    KEvent::Register(kernel, m_wakeup_event);
+    // Reserve a new thread from the process resource limit
+    KScopedResourceReservation thread_reservation(m_process, LimitableResource::Threads);
+    ASSERT(thread_reservation.Succeeded());
+
+    // Initialize thread.
+    m_thread = KThread::Create(kernel);
+    ASSERT(KThread::InitializeDummyThread(m_thread, m_process).IsSuccess());
+
+    // Commit the thread reservation.
+    thread_reservation.Commit();
 
     // Start thread.
-    m_thread = std::jthread([this] { LoopProcess(); });
+    m_host_thread = std::jthread([this] { LoopProcess(); });
 }
 
 ServiceThread::ServiceThread(KernelCore& kernel, const std::string& name)
-- 
cgit v1.2.3