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

CommandQueueMT: Reduce lock contention in cases of single flusher

Browse Source
This commit is contained in:
Pedro J. Estébanez
2025-11-07 12:38:29 +01:00
parent b16a8b8a76
commit 4ba4558cf6
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/templates/command_queue_mt.h
View File

@ -107,6 +107,7 @@ class CommandQueueMT {
static const uint32_t DEFAULT_COMMAND_MEM_SIZE_KB = 64; static const uint32_t DEFAULT_COMMAND_MEM_SIZE_KB = 64;
bool unique_flusher = false;
BinaryMutex mutex; BinaryMutex mutex;
LocalVector<uint8_t> command_mem; LocalVector<uint8_t> command_mem;
ConditionVariable sync_cond_var; ConditionVariable sync_cond_var;
@ -176,9 +177,17 @@ class CommandQueueMT {
// invalidating the pointer due to reallocs. // invalidating the pointer due to reallocs.
memcpy(cmd_backup, (char *)cmd, size); memcpy(cmd_backup, (char *)cmd, size);
uint32_t allowance_id = WorkerThreadPool::thread_enter_unlock_allowance_zone(lock); if (unique_flusher) {
((CommandBase *)cmd_backup)->call(); // A single thread will pump; the lock is only needed for the command queue itself.
WorkerThreadPool::thread_exit_unlock_allowance_zone(allowance_id); lock.temp_unlock();
((CommandBase *)cmd_backup)->call();
lock.temp_relock();
} else {
// At least we can unlock during WTP operations.
uint32_t allowance_id = WorkerThreadPool::thread_enter_unlock_allowance_zone(lock);
((CommandBase *)cmd_backup)->call();
WorkerThreadPool::thread_exit_unlock_allowance_zone(allowance_id);
}
// Handle potential realloc due to the command and unlock allowance. // Handle potential realloc due to the command and unlock allowance.
cmd = reinterpret_cast<CommandBase *>(&command_mem[flush_read_ptr]); cmd = reinterpret_cast<CommandBase *>(&command_mem[flush_read_ptr]);
@ -266,7 +275,8 @@ public:
pump_task_id = p_task_id; pump_task_id = p_task_id;
} }
CommandQueueMT() { CommandQueueMT(bool p_unique_flusher = false) :
unique_flusher(p_unique_flusher) {
command_mem.reserve(DEFAULT_COMMAND_MEM_SIZE_KB * 1024); command_mem.reserve(DEFAULT_COMMAND_MEM_SIZE_KB * 1024);
} }
}; };

2
modules/betsy/image_compress_betsy.h
View File

@ -103,7 +103,7 @@ Error _betsy_compress_s3tc(Image *r_img, Image::UsedChannels p_channels);
class BetsyCompressor : public Object { class BetsyCompressor : public Object {
GDSOFTCLASS(BetsyCompressor, Object); GDSOFTCLASS(BetsyCompressor, Object);
mutable CommandQueueMT command_queue; mutable CommandQueueMT command_queue = CommandQueueMT(true);
bool exit = false; bool exit = false;
WorkerThreadPool::TaskID task_id = WorkerThreadPool::INVALID_TASK_ID; WorkerThreadPool::TaskID task_id = WorkerThreadPool::INVALID_TASK_ID;

2
servers/rendering/rendering_server_default.h
View File

@ -74,7 +74,7 @@ class RenderingServerDefault : public RenderingServer {
uint64_t print_frame_profile_ticks_from = 0; uint64_t print_frame_profile_ticks_from = 0;
uint32_t print_frame_profile_frame_count = 0; uint32_t print_frame_profile_frame_count = 0;
mutable CommandQueueMT command_queue; mutable CommandQueueMT command_queue = CommandQueueMT(true);
Thread::ID server_thread = Thread::MAIN_ID; Thread::ID server_thread = Thread::MAIN_ID;
WorkerThreadPool::TaskID server_task_id = WorkerThreadPool::INVALID_TASK_ID; WorkerThreadPool::TaskID server_task_id = WorkerThreadPool::INVALID_TASK_ID;