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

Let languages init & finish run without locks held

Browse Source
This commit is contained in:
Pedro J. Estébanez
2023-11-13 16:06:48 +01:00
parent 59457685c1
commit f05f8c399e
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/object/script_language.cpp
View File

@@ -223,26 +223,48 @@ void ScriptServer::init_languages() {
} }
} }
HashSet<ScriptLanguage *> langs_to_init;
{ {
MutexLock lock(languages_mutex); MutexLock lock(languages_mutex);
for (int i = 0; i < _language_count; i++) { for (int i = 0; i < _language_count; i++) {
_languages[i]->init(); if (_languages[i]) {
langs_to_init.insert(_languages[i]);
}
} }
}
for (ScriptLanguage *E : langs_to_init) {
E->init();
}
{
MutexLock lock(languages_mutex);
languages_ready = true; languages_ready = true;
} }
} }
void ScriptServer::finish_languages() { void ScriptServer::finish_languages() {
MutexLock lock(languages_mutex); HashSet<ScriptLanguage *> langs_to_finish;
for (int i = 0; i < _language_count; i++) { {
_languages[i]->finish(); MutexLock lock(languages_mutex);
for (int i = 0; i < _language_count; i++) {
if (_languages[i]) {
langs_to_finish.insert(_languages[i]);
}
}
} }
global_classes_clear();
languages_ready = false; for (ScriptLanguage *E : langs_to_finish) {
E->finish();
}
{
MutexLock lock(languages_mutex);
languages_ready = false;
}
global_classes_clear();
} }
bool ScriptServer::are_languages_initialized() { bool ScriptServer::are_languages_initialized() {