Merge pull request #96225 from RandomShaper/wtp_fix_yield

WorkerThreadPool: Fix end-of-yield logic potentially leading to deadlocks
godotengine · Aug 28, 2024 · e439154 · e439154
2 parents 9f05ca9 + 5dade0e
commit e439154
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/object/worker_thread_pool.cpp b/core/object/worker_thread_pool.cpp
@@ -461,7 +461,10 @@ void WorkerThreadPool::_wait_collaboratively(ThreadData *p_caller_pool_thread, T
 			p_caller_pool_thread->signaled = false;
 
 			if (IS_WAIT_OVER) {
-				p_caller_pool_thread->yield_is_over = false;
+				if (unlikely(p_task == ThreadData::YIELDING)) {
+					p_caller_pool_thread->yield_is_over = false;
+				}
+
 				if (!exit_threads && was_signaled) {
 					// This thread was awaken for some additional reason, but it's about to exit.
 					// Let's find out what may be pending and forward the requests.