Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-09-20 06:22:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #96617 from RandomShaper/res_loader_pending

Browse Source 
ResourceLoader: Add last resort life-time insurance for tokens
This commit is contained in:
Rémi Verschelde 2024-09-06 22:38:41 +02:00
commit effbc07976
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/io/resource_loader.cpp
View File

@ -319,6 +319,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
}
// This implementation must allow re-entrancy for a task that started awaiting in a deeper stack frame.
// The load task token must be manually re-referenced before this is called, which includes threaded runs.
void ResourceLoader::_run_load_task(void *p_userdata) {
ThreadLoadTask &load_task = *(ThreadLoadTask *)p_userdata;
@ -449,6 +450,9 @@ void ResourceLoader::_run_load_task(void *p_userdata) {
}
}
// It's safe now to let the task go in case no one else was grabbing the token.
load_task.load_token->unreference();
if (unlock_pending) {
thread_load_mutex.unlock();
}
@ -599,6 +603,11 @@ Ref<ResourceLoader::LoadToken> ResourceLoader::_load_start(const String &p_path,
}
}
// It's important to keep the token alive because until the load completes,
// which includes before the thread start, it may happen that no one is grabbing
// the token anymore so it's released.
load_task_ptr->load_token->reference();
if (p_thread_mode == LOAD_THREAD_FROM_CURRENT) {
// The current thread may happen to be a thread from the pool.
WorkerThreadPool::TaskID tid = WorkerThreadPool::get_singleton()->get_caller_task_id();
@ -783,6 +792,7 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
// resource loading that means that the task to wait for can be restarted here to break the
// cycle, with as much recursion into this process as needed.
// When the stack is eventually unrolled, the original load will have been notified to go on.
load_task.load_token->reference();
_run_load_task(&load_task);
}