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

WorkerThreadPool: Fix thread message queue not restored after overridden in a task

Browse Source 
Also, simplifies the thread override teardown in MessageQueue.
This commit is contained in:
Pedro J. Estébanez 2024-06-13 10:14:14 +02:00
parent 475248d99d
commit 21c03d1956
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/io/resource_loader.cpp
View File

@ -395,6 +395,7 @@ void ResourceLoader::_thread_load_function(void *p_userdata) {
if (load_nesting == 0) { if (load_nesting == 0) {
if (mq_override) { if (mq_override) {
MessageQueue::set_thread_singleton_override(nullptr);
memdelete(mq_override); memdelete(mq_override);
} }
memdelete(load_paths_stack); memdelete(load_paths_stack);

6
core/object/message_queue.cpp
View File

@ -481,10 +481,7 @@ CallQueue::~CallQueue() {
if (!allocator_is_custom) { if (!allocator_is_custom) {
memdelete(allocator); memdelete(allocator);
} }
// This is done here to avoid a circular dependency between the safety checks and the thread singleton pointer. DEV_ASSERT(!is_current_thread_override);
if (this == MessageQueue::thread_singleton) {
MessageQueue::thread_singleton = nullptr;
}
} }
////////////////////// //////////////////////
@ -493,7 +490,6 @@ CallQueue *MessageQueue::main_singleton = nullptr;
thread_local CallQueue *MessageQueue::thread_singleton = nullptr; thread_local CallQueue *MessageQueue::thread_singleton = nullptr;
void MessageQueue::set_thread_singleton_override(CallQueue *p_thread_singleton) { void MessageQueue::set_thread_singleton_override(CallQueue *p_thread_singleton) {
DEV_ASSERT(p_thread_singleton); // To unset the thread singleton, don't call this with nullptr, but just memfree() it.
#ifdef DEV_ENABLED #ifdef DEV_ENABLED
if (thread_singleton) { if (thread_singleton) {
thread_singleton->is_current_thread_override = false; thread_singleton->is_current_thread_override = false;

3
core/object/worker_thread_pool.cpp
View File

@ -53,7 +53,9 @@ void WorkerThreadPool::_process_task(Task *p_task) {
int pool_thread_index = thread_ids[Thread::get_caller_id()]; int pool_thread_index = thread_ids[Thread::get_caller_id()];
ThreadData &curr_thread = threads[pool_thread_index]; ThreadData &curr_thread = threads[pool_thread_index];
Task *prev_task = nullptr; // In case this is recursively called. Task *prev_task = nullptr; // In case this is recursively called.
bool safe_for_nodes_backup = is_current_thread_safe_for_nodes(); bool safe_for_nodes_backup = is_current_thread_safe_for_nodes();
CallQueue *call_queue_backup = MessageQueue::get_singleton() != MessageQueue::get_main_singleton() ? MessageQueue::get_singleton() : nullptr;
{ {
// Tasks must start with this unset. They are free to set-and-forget otherwise. // Tasks must start with this unset. They are free to set-and-forget otherwise.
@ -169,6 +171,7 @@ void WorkerThreadPool::_process_task(Task *p_task) {
} }
set_current_thread_safe_for_nodes(safe_for_nodes_backup); set_current_thread_safe_for_nodes(safe_for_nodes_backup);
MessageQueue::set_thread_singleton_override(call_queue_backup);
#endif #endif
} }