Improve threads

Utilities/Thread.cpp

@@ -1722,6 +1722,8 @@ DECLARE(thread_ctrl::g_native_core_layout) { native_core_arrangement::undefined
 
 void thread_base::start(native_entry entry)
 {
+	thread_ctrl::g_thread_count++;
+
 #ifdef _WIN32
 	m_thread = ::_beginthreadex(nullptr, 0, entry, this, CREATE_SUSPENDED, nullptr);
 	verify("thread_ctrl::start" HERE), m_thread, ::ResumeThread(reinterpret_cast<HANDLE>(+m_thread)) != -1;
@@ -1863,6 +1865,7 @@ void thread_base::finalize() noexcept
 {
 	g_tls_log_prefix = []() -> std::string { return {}; };
 	thread_ctrl::g_tls_this_thread = nullptr;
+	thread_ctrl::g_thread_count--;
 }
 
 void thread_ctrl::_wait_for(u64 usec, bool alert /* true */)

Utilities/Thread.h

@@ -192,6 +192,9 @@ class thread_ctrl final
 	// Target cpu core layout
 	static atomic_t<native_core_arrangement> g_native_core_layout;
 
+	// Global thread counter
+	static inline atomic_t<u64> g_thread_count = 0;
+
 	// Internal waiting function, may throw. Infinite value is -1.
 	static void _wait_for(u64 usec, bool alert);
 
@@ -275,6 +278,11 @@ class thread_ctrl final
 		return g_tls_this_thread;
 	}
 
+	static u64 get_count()
+	{
+		return g_thread_count.load();
+	}
+
 	// Detect layout
 	static void detect_cpu_layout();
 

rpcs3/Emu/CPU/CPUThread.cpp

@@ -630,9 +630,6 @@ void cpu_thread::stop_all() noexcept
 		std::this_thread::sleep_for(10ms);
 	}
 
-	// Workaround for remaining threads (TODO)
-	std::this_thread::sleep_for(1300ms);
-
 	sys_log.notice("All CPU threads have been stopped.");
 }
 

rpcs3/Emu/RSX/RSXThread.cpp

@@ -498,7 +498,7 @@ namespace rsx
 
 		vblank_count = 0;
 
-		auto vblank_body = [this]()
+		g_fxo->init_crtp<named_thread>("VBlank Thread", [this]()
 		{
 			// See sys_timer_usleep for details
 #ifdef __linux__
@@ -562,11 +562,9 @@ namespace rsx
 
 				thread_ctrl::wait_for(100);
 			}
-		};
-
-		g_fxo->init<named_thread<decltype(vblank_body)>>("VBlank Thread", std::move(vblank_body));
+		});
 
-		auto decomp_body = [this]
+		g_fxo->init_crtp<named_thread>("RSX Decompiler Thread", [this]
 		{
 			if (g_cfg.video.disable_asynchronous_shader_compiler)
 			{
@@ -597,9 +595,7 @@ namespace rsx
 			}
 
 			on_decompiler_exit();
-		};
-
-		g_fxo->init<named_thread<decltype(decomp_body)>>("RSX Decompiler Thread", std::move(decomp_body));
+		});
 
 		// Raise priority above other threads
 		thread_ctrl::set_native_priority(1);

rpcs3/Emu/System.cpp

@@ -868,7 +868,7 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
 			// Workaround for analyser glitches
 			vm::falloc(0x10000, 0xf0000, vm::main);
 
-			auto sprx_loader_body = [this]
+			g_fxo->init_crtp<named_thread>("SPRX Loader"sv, [this]
 			{
 				std::vector<std::string> dir_queue;
 				dir_queue.emplace_back(m_path + '/');
@@ -983,9 +983,8 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
 				{
 					Emu.Stop();
 				});
-			};
+			});
 
-			g_fxo->init<named_thread<decltype(sprx_loader_body)>>("SPRX Loader"sv, std::move(sprx_loader_body));
 			return;
 		}
 
@@ -1600,6 +1599,14 @@ void Emulator::Stop(bool restart)
 
 	cpu_thread::stop_all();
 	g_fxo->reset();
+
+	while (thread_ctrl::get_count())
+	{
+		std::this_thread::sleep_for(10ms);
+	}
+
+	sys_log.notice("All threads have been stopped.");
+
 	lv2_obj::cleanup();
 	idm::clear();
 

rpcs3/util/fixed_typemap.hpp

@@ -165,6 +165,14 @@ namespace stx
 			return obj;
 		}
 
+		// Special stuff
+		template <template <class...> typename CTAD, typename... Args>
+		auto init_crtp(Args&&... args) noexcept
+		{
+			using T = decltype(CTAD{std::forward<Args>(args)...});
+			return init<T>(std::forward<Args>(args)...);
+		}
+
 		// Obtain object pointer (the only thread safe function)
 		template <typename T>
 		T* get() const noexcept