diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-08-28 15:26:08 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-17 09:55:10 +0200 |
| commit | 2c612abdd12bf91dc90e8534ba01954e1879995c (patch) | |
| tree | 641610c23248603732054822fd575152145a51a4 /core | |
| parent | f273c7c77352f0e50846e7fe3aab9040e64033c0 (diff) | |
| download | redot-engine-2c612abdd12bf91dc90e8534ba01954e1879995c.tar.gz | |
WorkerThreadPool: Fix end-of-yield logic potentially leading to deadlocks
(cherry picked from commit 5dade0e08b6647cf4b836402a797e9b8f46052b1)
Diffstat (limited to 'core')
| -rw-r--r-- | core/object/worker_thread_pool.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/object/worker_thread_pool.cpp b/core/object/worker_thread_pool.cpp index 56b9fa8475..8646639535 100644 --- a/core/object/worker_thread_pool.cpp +++ b/core/object/worker_thread_pool.cpp @@ -468,7 +468,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. |