godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WorkerThreadPool: Fix data race

Browse Source
This commit is contained in:
Pedro J. Estébanez 2024-04-08 17:37:00 +02:00
parent b091162a90
commit 71facbaa88
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/object/worker_thread_pool.cpp
View File

@ -60,11 +60,13 @@ void WorkerThreadPool::_process_task(Task *p_task) {
// its pre-created threads can't have ScriptServer::thread_enter() called on them early. // its pre-created threads can't have ScriptServer::thread_enter() called on them early.
// Therefore, we do it late at the first opportunity, so in case the task // Therefore, we do it late at the first opportunity, so in case the task
// about to be run uses scripting, guarantees are held. // about to be run uses scripting, guarantees are held.
task_mutex.lock();
if (!curr_thread.ready_for_scripting && ScriptServer::are_languages_initialized()) { if (!curr_thread.ready_for_scripting && ScriptServer::are_languages_initialized()) {
task_mutex.unlock();
ScriptServer::thread_enter(); ScriptServer::thread_enter();
task_mutex.lock();
curr_thread.ready_for_scripting = true; curr_thread.ready_for_scripting = true;
} }
task_mutex.lock();
p_task->pool_thread_index = pool_thread_index; p_task->pool_thread_index = pool_thread_index;
prev_task = curr_thread.current_task; prev_task = curr_thread.current_task;
curr_thread.current_task = p_task; curr_thread.current_task = p_task;