Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #103298 from bruvzg/comque_race

Browse source 
Use atomic flag to prevent `flush_if_pending` from reading unlocked `command_mem`.
This commit is contained in:
Rémi Verschelde 2025-02-26 00:27:55 +01:00 • committed by GitHub
commit 01545c995b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/templates/command_queue_mt.h
View file

@ -114,6 +114,7 @@ class CommandQueueMT {
uint32_t sync_awaiters = 0;
WorkerThreadPool::TaskID pump_task_id = WorkerThreadPool::INVALID_TASK_ID;
uint64_t flush_read_ptr = 0;
std::atomic<bool> pending;
template <typename T, typename... Args>
_FORCE_INLINE_ void create_command(Args &&...p_args) {
@ -126,6 +127,7 @@ class CommandQueueMT {
*(uint64_t *)&command_mem[size] = alloc_size;
void *cmd = &command_mem[size + sizeof(uint64_t)];
new (cmd) T(std::forward<Args>(p_args)...);
pending.store(true);
}
template <typename T, bool NeedsSync, typename... Args>
@ -186,6 +188,7 @@ class CommandQueueMT {
}
command_mem.clear();
pending.store(false);
flush_read_ptr = 0;
_prevent_sync_wraparound();
@ -226,7 +229,7 @@ public:
}
_FORCE_INLINE_ void flush_if_pending() {
if (unlikely(command_mem.size() > 0)) {
if (unlikely(pending.load())) {
_flush();
}
}