godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #93032 from RandomShaper/wtp_antilock

Browse Source 
GDScript: Avoid deadlock possibility in multi-threaded load
This commit is contained in:
Rémi Verschelde
2024-06-28 14:42:48 +02:00
parent a31525c4da d334632908
commit 6f8b90e412
4 changed files with 96 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gdscript/gdscript_cache.cpp
View File

@@ -340,7 +340,11 @@ Ref<GDScript> GDScriptCache::get_full_script(const String &p_path, Error &r_erro
}
}
// Allowing lifting the lock might cause a script to be reloaded multiple times,
// which, as a last resort deadlock prevention strategy, is a good tradeoff.
uint32_t allowance_id = WorkerThreadPool::thread_enter_unlock_allowance_zone(&singleton->mutex);
r_error = script->reload(true);
WorkerThreadPool::thread_exit_unlock_allowance_zone(allowance_id);
if (r_error) {
return script;
}