Skip to content

Revert "Core: Switch RID_alloc::owns to lock-free" #114965

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
stuartcarnie wants to merge 1 commit into from
Closed

Revert "Core: Switch RID_alloc::owns to lock-free" #114965

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
41 changes: 7 additions & 34 deletions core/templates/rid_owner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,24 +310,16 @@ class RID_Alloc : public RID_AllocBase {
}

_FORCE_INLINE_ bool owns(const RID &p_rid) const {
if (p_rid == RID()) {
return false;
}

if constexpr (THREAD_SAFE) {
SYNC_ACQUIRE;
mutex.lock();
}

uint64_t id = p_rid.get_id();
uint32_t idx = uint32_t(id & 0xFFFFFFFF);
uint32_t ma;
if constexpr (THREAD_SAFE) {
ma = ((std::atomic<uint32_t> *)&max_alloc)->load(std::memory_order_relaxed);
} else {
ma = max_alloc;
}

if (unlikely(idx >= ma)) {
if (unlikely(idx >= max_alloc)) {
if constexpr (THREAD_SAFE) {
mutex.unlock();
}
return false;
}

Expand All @@ -336,29 +328,10 @@ class RID_Alloc : public RID_AllocBase {

uint32_t validator = uint32_t(id >> 32);

if constexpr (THREAD_SAFE) {
#ifdef TSAN_ENABLED
__tsan_acquire(&chunks[idx_chunk]); // We know not a race in practice.
__tsan_acquire(&chunks[idx_chunk][idx_element]); // We know not a race in practice.
#endif
}

Chunk &c = chunks[idx_chunk][idx_element];
bool owned = (chunks[idx_chunk][idx_element].validator & 0x7FFFFFFF) == validator;

if constexpr (THREAD_SAFE) {
#ifdef TSAN_ENABLED
__tsan_release(&chunks[idx_chunk]);
__tsan_release(&chunks[idx_chunk][idx_element]);
__tsan_acquire(&c.validator); // We know not a race in practice.
#endif
}

bool owned = (c.validator & 0x7FFFFFFF) == validator;

if constexpr (THREAD_SAFE) {
#ifdef TSAN_ENABLED
__tsan_release(&c.validator);
#endif
mutex.unlock();
}

return owned;
Expand Down