waiter_reg_t, cellSyncBarrier improved

Utilities/Thread.cpp

@@ -235,7 +235,9 @@ bool waiter_is_stopped(const char* func_name, u64 signal_id)
 	return false;
 }
 
-void waiter_register(u64 signal_id, NamedThreadBase* thread)
+waiter_reg_t::waiter_reg_t(u64 signal_id)
+	: signal_id(signal_id)
+	, thread(GetCurrentNamedThread())
 {
 	std::lock_guard<std::mutex> lock(g_waiter_map.m_mutex);
 
@@ -243,12 +245,12 @@ void waiter_register(u64 signal_id, NamedThreadBase* thread)
 	g_waiter_map.m_waiters.push_back({ signal_id, thread });
 }
 
-void waiter_unregister(u64 signal_id, NamedThreadBase* thread)
+waiter_reg_t::~waiter_reg_t()
 {
 	std::lock_guard<std::mutex> lock(g_waiter_map.m_mutex);
 
 	// remove waiter
-	for (s32 i = g_waiter_map.m_waiters.size() - 1; i >= 0; i--)
+	for (size_t i = g_waiter_map.m_waiters.size() - 1; i >= 0; i--)
 	{
 		if (g_waiter_map.m_waiters[i].signal_id == signal_id && g_waiter_map.m_waiters[i].thread == thread)
 		{

Utilities/Thread.h

@@ -73,27 +73,32 @@ public:
 
 // for internal use (checks if Emu is stopped)
 bool waiter_is_stopped(const char* func_name, u64 signal_id);
-// for internal use
-void waiter_register(u64 signal_id, NamedThreadBase* thread);
-// for internal use
-void waiter_unregister(u64 signal_id, NamedThreadBase* thread);
 
-// wait until waiter_func() returns true, signal_id is arbitrary number
+struct waiter_reg_t
+{
+	const u64 signal_id;
+	NamedThreadBase* const thread;
+
+	waiter_reg_t(u64 signal_id);
+	~waiter_reg_t();
+};
+
+// wait until waiter_func() returns true, signal_id is an arbitrary number
 template<typename WT> static __forceinline void waiter_op(const char* func_name, u64 signal_id, const WT waiter_func)
 {
+	// check condition
 	if (waiter_func()) return;
 
-	NamedThreadBase* thread = GetCurrentNamedThread();
-	waiter_register(signal_id, thread);
+	// register waiter
+	waiter_reg_t waiter(signal_id);
 
 	while (true)
 	{
-		thread->WaitForAnySignal(1);
+		// wait for 1 ms or until signal arrived
+		waiter.thread->WaitForAnySignal(1);
 		if (waiter_is_stopped(func_name, signal_id)) break;
 		if (waiter_func()) break;
 	}
-
-	waiter_unregister(signal_id, thread);
 }
 
 // signal all threads waiting on waiter_op() with the same signal_id (signaling only hints those threads that corresponding conditions are *probably* met)