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 #104237 from Ivorforce/optimize-thread-pool-waiting

Browse Source 
Optimize thread pools by avoiding needless locks and unlocks of the `task_mutex`.
This commit is contained in:
Rémi Verschelde
2025-03-21 13:03:37 +01:00
parent f51ea67fb5 9d30732c5b
commit 1f682b6554
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/object/worker_thread_pool.cpp
View File

@@ -186,26 +186,34 @@ void WorkerThreadPool::_thread_function(void *p_user) {
while (true) {
Task *task_to_process = nullptr;
{
// Create the lock outside the inner loop so it isn't needlessly unlocked and relocked
// when no task was found to process, and the loop is re-entered.
MutexLock lock(thread_data->pool->task_mutex);
bool exit = thread_data->pool->_handle_runlevel(thread_data, lock);
if (unlikely(exit)) {
break;
}
while (true) {
bool exit = thread_data->pool->_handle_runlevel(thread_data, lock);
if (unlikely(exit)) {
return;
}
thread_data->signaled = false;
thread_data->signaled = false;
if (thread_data->pool->task_queue.first()) {
if (!thread_data->pool->task_queue.first()) {
// There wasn't a task available yet.
// Let's wait for the next notification, then recheck.
thread_data->cond_var.wait(lock);
continue;
}
// Got a task to process! Remove it from the queue, then break into the task handling section.
task_to_process = thread_data->pool->task_queue.first()->self();
thread_data->pool->task_queue.remove(thread_data->pool->task_queue.first());
} else {
thread_data->cond_var.wait(lock);
break;
}
}
if (task_to_process) {
thread_data->pool->_process_task(task_to_process);
}
DEV_ASSERT(task_to_process);
thread_data->pool->_process_task(task_to_process);
}
}