VERY experimental Nintendo Switch 2 emulator
C++
service_thread: register service threads to the logical owner process
Liamc835c254a3ec
diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cppindex cc88d08f03..78076a3466 100644--- a/src/core/hle/kernel/k_thread.cpp+++ b/src/core/hle/kernel/k_thread.cpp@@ -263,9 +263,9 @@ Result KThread::InitializeThread(KThread* thread, KThreadFunction func, uintptr_R_SUCCEED();}-Result KThread::InitializeDummyThread(KThread* thread) {+Result KThread::InitializeDummyThread(KThread* thread, KProcess* owner) {// Initialize the thread.- R_TRY(thread->Initialize({}, {}, {}, DummyThreadPriority, 3, {}, ThreadType::Dummy));+ R_TRY(thread->Initialize({}, {}, {}, DummyThreadPriority, 3, owner, ThreadType::Dummy));// Initialize emulation parameters.thread->stack_parameters.disable_count = 0;diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.hindex 30aa10c9a8..f38c92bffc 100644--- a/src/core/hle/kernel/k_thread.h+++ b/src/core/hle/kernel/k_thread.h@@ -415,7 +415,7 @@ public:static void PostDestroy(uintptr_t arg);- [[nodiscard]] static Result InitializeDummyThread(KThread* thread);+ [[nodiscard]] static Result InitializeDummyThread(KThread* thread, KProcess* owner);[[nodiscard]] static Result InitializeMainThread(Core::System& system, KThread* thread,s32 virt_core);diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cppindex 6df77b4239..d1892e0785 100644--- a/src/core/hle/kernel/kernel.cpp+++ b/src/core/hle/kernel/kernel.cpp@@ -84,7 +84,7 @@ struct KernelCore::Impl {InitializeResourceManagers(pt_heap_region.GetAddress(), pt_heap_region.GetSize());}- RegisterHostThread();+ RegisterHostThread(nullptr);default_service_thread = CreateServiceThread(kernel, "DefaultServiceThread");}@@ -300,15 +300,18 @@ struct KernelCore::Impl {}// Gets the dummy KThread for the caller, allocating a new one if this is the first time- KThread* GetHostDummyThread() {+ KThread* GetHostDummyThread(KThread* existing_thread) {auto initialize = [this](KThread* thread) {- ASSERT(KThread::InitializeDummyThread(thread).IsSuccess());+ ASSERT(KThread::InitializeDummyThread(thread, nullptr).IsSuccess());thread->SetName(fmt::format("DummyThread:{}", GetHostThreadId()));return thread;};- thread_local auto raw_thread = KThread(system.Kernel());- thread_local auto thread = initialize(&raw_thread);+ thread_local KThread raw_thread{system.Kernel()};+ thread_local KThread* thread = nullptr;+ if (thread == nullptr) {+ thread = (existing_thread == nullptr) ? initialize(&raw_thread) : existing_thread;+ }return thread;}@@ -323,9 +326,9 @@ struct KernelCore::Impl {}/// Registers a new host thread by allocating a host thread ID for it- void RegisterHostThread() {+ void RegisterHostThread(KThread* existing_thread) {[[maybe_unused]] const auto this_id = GetHostThreadId();- [[maybe_unused]] const auto dummy_thread = GetHostDummyThread();+ [[maybe_unused]] const auto dummy_thread = GetHostDummyThread(existing_thread);}[[nodiscard]] u32 GetCurrentHostThreadID() {@@ -356,7 +359,7 @@ struct KernelCore::Impl {KThread* GetCurrentEmuThread() {const auto thread_id = GetCurrentHostThreadID();if (thread_id >= Core::Hardware::NUM_CPU_CORES) {- return GetHostDummyThread();+ return GetHostDummyThread(nullptr);}return current_thread;@@ -1033,8 +1036,12 @@ void KernelCore::RegisterCoreThread(std::size_t core_id) {impl->RegisterCoreThread(core_id);}-void KernelCore::RegisterHostThread() {- impl->RegisterHostThread();+void KernelCore::RegisterHostThread(KThread* existing_thread) {+ impl->RegisterHostThread(existing_thread);++ if (existing_thread != nullptr) {+ ASSERT(GetCurrentEmuThread() == existing_thread);+ }}u32 KernelCore::GetCurrentHostThreadID() const {diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.hindex 4ae6b39236..8a21568f73 100644--- a/src/core/hle/kernel/kernel.h+++ b/src/core/hle/kernel/kernel.h@@ -236,7 +236,7 @@ public:void RegisterCoreThread(std::size_t core_id);/// Register the current thread as a non CPU core thread.- void RegisterHostThread();+ void RegisterHostThread(KThread* existing_thread = nullptr);/// Gets the virtual memory manager for the kernel.KMemoryManager& MemoryManager();diff --git a/src/core/hle/kernel/service_thread.cpp b/src/core/hle/kernel/service_thread.cppindex c8fe42537e..7a85be77f6 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)