More asserts.

ClaytonKnittel · Nov 30, 2024 · 970bec5 · 970bec5
1 parent 6e2bd5d
commit 970bec5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/ckmalloc/main_allocator.h b/src/ckmalloc/main_allocator.h
@@ -221,6 +221,7 @@ template <MetadataAllocInterface MetadataAlloc, SlabMapInterface SlabMap,
 void MainAllocatorImpl<MetadataAlloc, SlabMap, SmallAllocator,
                        LargeAllocator>::Free(Void* ptr) {
   Slab* slab = slab_map_->FindSlab(PageId::FromPtr(ptr));
+  CK_ASSERT_NE(slab, nullptr);
   CK_ASSERT_NE(slab->Type(), SlabType::kFree);
   CK_ASSERT_NE(slab->Type(), SlabType::kUnmapped);
 

diff --git a/src/ckmalloc/slab_map.h b/src/ckmalloc/slab_map.h
@@ -172,10 +172,10 @@ class SlabMapImpl {
   };
 
   template <typename T>
-  T* Allocate();
+  T* Allocate() CK_EXCLUSIVE_LOCKS_REQUIRED(path_allocator_mutex_);
 
   template <typename T>
-  void Free(T* node);
+  void Free(T* node) CK_EXCLUSIVE_LOCKS_REQUIRED(path_allocator_mutex_);
 
   static size_t RootIdx(PageId page_id) {
     return page_id.Idx() / (kNodeSize * kNodeSize);