NFC: plumb entropy from LocalAlloc to BatchIt

microsoft · Sep 10, 2024 · e189d18 · e189d18
1 parent ba95d48
commit e189d18
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/snmalloc/mem/localalloc.h b/src/snmalloc/mem/localalloc.h
@@ -286,7 +286,7 @@ namespace snmalloc
           address_cast(entry.get_slab_metadata()));
 #endif
         local_cache.remote_dealloc_cache.template dealloc<sizeof(CoreAlloc)>(
-          entry.get_slab_metadata(), p);
+          entry.get_slab_metadata(), p, &local_cache.entropy);
         post_remote_cache();
         return;
       }
@@ -679,7 +679,7 @@ namespace snmalloc
         if (local_cache.remote_dealloc_cache.reserve_space(entry))
         {
           local_cache.remote_dealloc_cache.template dealloc<sizeof(CoreAlloc)>(
-            entry.get_slab_metadata(), p_tame);
+            entry.get_slab_metadata(), p_tame, &local_cache.entropy);
 #  ifdef SNMALLOC_TRACING
           message<1024>(
             "Remote dealloc fast {} ({}, {})",

diff --git a/src/snmalloc/mem/remotecache.h b/src/snmalloc/mem/remotecache.h
@@ -61,8 +61,11 @@ namespace snmalloc
     SNMALLOC_FAST_PATH void dealloc(
       typename Config::PagemapEntry::SlabMetadata* meta,
       freelist::HeadPtr r,
+      LocalEntropy* entropy,
       Forward forward)
     {
+      UNUSED(entropy);
+
       size_t ix_set = ring_set(meta);
 
       for (size_t ix_way = 0; ix_way < DEALLOC_BATCH_RING_ASSOC; ix_way++)
@@ -137,8 +140,11 @@ namespace snmalloc
     SNMALLOC_FAST_PATH void dealloc(
       typename Config::PagemapEntry::SlabMetadata*,
       freelist::HeadPtr r,
+      LocalEntropy* entropy,
       Forward forward)
     {
+      UNUSED(entropy);
+
       auto& entry = Config::Backend::get_metaentry(address_cast(r));
       forward(
         entry.get_remote()->trunc_id(),
@@ -222,7 +228,9 @@ namespace snmalloc
 
     template<size_t allocator_size>
     SNMALLOC_FAST_PATH void dealloc(
-      typename Config::PagemapEntry::SlabMetadata* meta, capptr::Alloc<void> p)
+      typename Config::PagemapEntry::SlabMetadata* meta,
+      capptr::Alloc<void> p,
+      LocalEntropy* entropy)
     {
       SNMALLOC_ASSERT(initialised);
 
@@ -231,6 +239,7 @@ namespace snmalloc
       batching.dealloc(
         meta,
         r,
+        entropy,
         [this](
           RemoteAllocator::alloc_id_t target_id,
           capptr::Alloc<RemoteMessage> msg) {