FEXCore: Moves InternalThreadState ExecutionThread to the frontend

Once again this is another frontend construct, so move it to ThreadStateObject
FEX-Emu · Nov 29, 2024 · 28180c9 · 28180c9
1 parent f59fc0f
commit 28180c9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/FEXCore/include/FEXCore/Debug/InternalThreadState.h b/FEXCore/include/FEXCore/Debug/InternalThreadState.h
@@ -88,7 +88,6 @@ struct InternalThreadState : public FEXCore::Allocator::FEXAllocOperators {
 
   FEXCore::Context::Context* const CTX;
 
-  NonMovableUniquePtr<FEXCore::Threads::Thread> ExecutionThread;
   bool StartPaused {false};
   InterruptableConditionVariable StartRunning;
 

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls.cpp
@@ -664,7 +664,7 @@ uint64_t CloneHandler(FEXCore::Core::CpuStateFrame* Frame, FEX::HLE::clone3_args
 
     if (flags & CLONE_VFORK) {
       // If VFORK is set then the calling process is suspended until the thread exits with execve or exit
-      NewThread->Thread->ExecutionThread->join(nullptr);
+      NewThread->ExecutionThread->join(nullptr);
 
       // Normally a thread cleans itself up on exit. But because we need to join, we are now responsible
       FEX::HLE::_SyscallHandler->TM.DestroyThread(NewThread);

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/Syscalls/Thread.cpp
@@ -107,7 +107,7 @@ FEX::HLE::ThreadStateObject* CreateNewThread(FEXCore::Context::Context* CTX, FEX
   Arg->CTX = CTX;
   Arg->Thread = NewThread;
   Arg->ThreadWaiting = &ThreadWaitingEvent;
-  NewThread->Thread->ExecutionThread = FEXCore::Threads::Thread::Create(ThreadHandler, Arg);
+  NewThread->ExecutionThread = FEXCore::Threads::Thread::Create(ThreadHandler, Arg);
 
   // Wait for the thread to have started.
   ThreadWaitingEvent.Wait();

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/ThreadManager.cpp b/Source/Tools/LinuxEmulation/LinuxSyscalls/ThreadManager.cpp
@@ -52,13 +52,13 @@ void ThreadManager::RunThread(FEX::HLE::ThreadStateObject* Thread) {
 }
 
 void ThreadManager::HandleThreadDeletion(FEX::HLE::ThreadStateObject* Thread, bool NeedsTLSUninstall) {
-  if (Thread->Thread->ExecutionThread) {
-    if (Thread->Thread->ExecutionThread->joinable()) {
-      Thread->Thread->ExecutionThread->join(nullptr);
+  if (Thread->ExecutionThread) {
+    if (Thread->ExecutionThread->joinable()) {
+      Thread->ExecutionThread->join(nullptr);
     }
 
-    if (Thread->Thread->ExecutionThread->IsSelf()) {
-      Thread->Thread->ExecutionThread->detach();
+    if (Thread->ExecutionThread->IsSelf()) {
+      Thread->ExecutionThread->detach();
     }
   }
 

diff --git a/Source/Tools/LinuxEmulation/LinuxSyscalls/ThreadManager.h b/Source/Tools/LinuxEmulation/LinuxSyscalls/ThreadManager.h
@@ -75,6 +75,8 @@ struct ThreadStateObject : public FEXCore::Allocator::FEXAllocOperators {
   // personality emulation.
   uint32_t persona {};
 
+  FEXCore::Core::NonMovableUniquePtr<FEXCore::Threads::Thread> ExecutionThread;
+
   // Thread signaling information
   std::atomic<SignalEvent> SignalReason {SignalEvent::Nothing};