Skip to content

RID_Owner: Fix race conditions due to missing synchronization #114980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RandomShaper wants to merge 1 commit into from
Closed

RID_Owner: Fix race conditions due to missing synchronization #114980

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion core/templates/rid_owner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,17 @@
#endif

// The following macros would need to be implemented somehow
// for purely weakly ordered architectures. There's a test case
// for weakly ordered architectures. There's a test case
// ("[RID_Owner] Thread safety") with potential to catch issues
// on such architectures if these primitives fail to be implemented.
// For now, they will be just markers about needs that may arise.
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) // MSVC, x86.
#define WEAK_MEMORY_ORDER 0
#elif (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) // GCC/Clang, x86.
#define WEAK_MEMORY_ORDER 0
#else
#define WEAK_MEMORY_ORDER 1
#endif
#if WEAK_MEMORY_ORDER
// Ideally, we'd have implementations that collaborate with the
// sync mechanism used (e.g., the mutex) so instead of some full
Expand Down Expand Up @@ -119,6 +125,7 @@ class RID_Alloc : public RID_AllocBase {
_FORCE_INLINE_ RID _allocate_rid() {
if constexpr (THREAD_SAFE) {
mutex.lock();
SYNC_ACQUIRE;
}

if (alloc_count == max_alloc) {
Expand Down Expand Up @@ -175,6 +182,7 @@ class RID_Alloc : public RID_AllocBase {
alloc_count++;

if constexpr (THREAD_SAFE) {
SYNC_RELEASE;
mutex.unlock();
}

Expand Down Expand Up @@ -367,6 +375,7 @@ class RID_Alloc : public RID_AllocBase {
_FORCE_INLINE_ void free(const RID &p_rid) {
if constexpr (THREAD_SAFE) {
mutex.lock();
SYNC_ACQUIRE;
}

uint64_t id = p_rid.get_id();
Expand Down Expand Up @@ -401,6 +410,7 @@ class RID_Alloc : public RID_AllocBase {
free_list_chunks[alloc_count / elements_in_chunk][alloc_count % elements_in_chunk] = idx;

if constexpr (THREAD_SAFE) {
SYNC_RELEASE;
mutex.unlock();
}
}
Expand Down Expand Up @@ -429,6 +439,7 @@ class RID_Alloc : public RID_AllocBase {
void fill_owned_buffer(RID *p_rid_buffer) const {
if constexpr (THREAD_SAFE) {
mutex.lock();
SYNC_ACQUIRE;
}
uint32_t idx = 0;
for (size_t i = 0; i < max_alloc; i++) {
Expand Down