stress

RandomShaper · Oct 3, 2024 · 4173d11 · 4173d11
1 parent 13aa42c
commit 4173d11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/core/templates/rid_owner.h b/core/templates/rid_owner.h
@@ -77,7 +77,7 @@ class RID_Alloc : public RID_AllocBase {
 	uint32_t **free_list_chunks = nullptr;
 
 	uint32_t elements_in_chunk;
-	std::atomic<uint32_t> max_alloc = 0;
+	uint32_t max_alloc = 0;
 	uint32_t alloc_count = 0;
 	uint32_t chunk_limit = 0;
 
@@ -90,8 +90,7 @@ class RID_Alloc : public RID_AllocBase {
 			mutex.lock();
 		}
 
-		uint32_t curr_max_alloc = max_alloc.load(std::memory_order_relaxed);
-		if (alloc_count == curr_max_alloc) {
+		if (alloc_count == max_alloc) {
 			//allocate a new chunk
 			uint32_t chunk_count = alloc_count == 0 ? 0 : (max_alloc / elements_in_chunk);
 			if (THREAD_SAFE && chunk_count == chunk_limit) {
@@ -121,7 +120,7 @@ class RID_Alloc : public RID_AllocBase {
 				free_list_chunks[chunk_count][i] = alloc_count + i;
 			}
 
-			max_alloc.store(curr_max_alloc + elements_in_chunk, std::memory_order_release);
+			max_alloc += elements_in_chunk;
 		}
 
 		uint32_t free_index = free_list_chunks[alloc_count / elements_in_chunk][alloc_count % elements_in_chunk];
@@ -171,7 +170,7 @@ class RID_Alloc : public RID_AllocBase {
 
 		uint64_t id = p_rid.get_id();
 		uint32_t idx = uint32_t(id & 0xFFFFFFFF);
-		if (unlikely(idx >= max_alloc.load(std::memory_order_acquire))) {
+		if (unlikely(idx >= max_alloc)) {
 			return nullptr;
 		}
 

diff --git a/tests/core/templates/test_rid.h b/tests/core/templates/test_rid.h
@@ -234,7 +234,6 @@ TEST_CASE("[RID_Owner] Thread safety") {
 			tester.test();
 		}
 	}
-#if 0
 	SUBCASE("All items in one chunk, NOT pre-allocated") {
 		RID_OwnerTester tester(true, false);
 		tester.test();
@@ -247,7 +246,6 @@ TEST_CASE("[RID_Owner] Thread safety") {
 		RID_OwnerTester tester(false, false);
 		tester.test();
 	}
-#endif
 }
 } // namespace TestRID