Slab counting.

Author: mjp41

src/snmalloc/mem/allocstats.h

@@ -28,8 +28,8 @@ namespace snmalloc
   {
     MonotoneStat objects_allocated{};
     MonotoneStat objects_deallocated{};
-    // MonotoneStat slabs_allocated;
-    // MonotoneStat slabs_deallocated;
+    MonotoneStat slabs_allocated{};
+    MonotoneStat slabs_deallocated{};
   };
 
   class AllocStats
@@ -48,17 +48,15 @@ namespace snmalloc
       return sizeclass[sizeclass_t::from_small_class(index).raw()];
     }
 
-    AllocStat operator+=(const AllocStats& other)
+    void operator+=(const AllocStats& other)
     {
-      AllocStat result;
       for (size_t i = 0; i < SIZECLASS_REP_SIZE; i++)
       {
         sizeclass[i].objects_allocated += other.sizeclass[i].objects_allocated;
         sizeclass[i].objects_deallocated += other.sizeclass[i].objects_deallocated;
-        // result.slabs_allocated += other.sizeclass[i].slabs_allocated;
-        // result.slabs_deallocated += other.sizeclass[i].slabs_deallocated;
+        sizeclass[i].slabs_allocated += other.sizeclass[i].slabs_allocated;
+        sizeclass[i].slabs_deallocated += other.sizeclass[i].slabs_deallocated;
       }
-      return result;
     }
   };
 } // namespace snmalloc

src/snmalloc/mem/corealloc.h

@@ -369,6 +369,8 @@ namespace snmalloc
         // don't touch the cache lines at this point in snmalloc_check_client.
         auto start = clear_slab(meta, sizeclass);
 
+        stats[sizeclass].slabs_deallocated++;
+        
         Config::Backend::dealloc_chunk(
           get_backend_local_state(),
           *meta,
@@ -405,6 +407,8 @@ namespace snmalloc
         // Remove from set of fully used slabs.
         meta->node.remove();
 
+        stats[entry.get_sizeclass()].slabs_deallocated++;
+
         Config::Backend::dealloc_chunk(
           get_backend_local_state(), *meta, p, size);
 
@@ -830,6 +834,7 @@ namespace snmalloc
       auto r = finish_alloc<zero_mem, Config>(p, sizeclass);
 
       stats[sizeclass].objects_allocated++;
+      stats[sizeclass].slabs_allocated++;
       return ticker.check_tick(r);
     }
 

src/snmalloc/mem/globalalloc.h

@@ -158,26 +158,33 @@ namespace snmalloc
     auto l_dump = dump++;
     if (l_dump == 0)
     {
-      message<1024>("snmalloc_allocs,dumpid,sizeclass,size,allocated,deallocated,in_use,bytes");
-      message<1024>("snmalloc_totals,dumpid,backend bytes,peak backend bytes,requested");
+      message<1024>("snmalloc_allocs,dumpid,sizeclass,size,allocated,deallocated,in_use,bytes,slabs allocated,slabs deallocated,slabs in_use,slabs bytes");
+      message<1024>("snmalloc_totals,dumpid,backend bytes,peak backend bytes,requested,slabs requested bytes");
     }
 
     auto stats = snmalloc::get_stats<Config>();
-    size_t total_live{0}; 
+    size_t total_live{0};
+    size_t total_live_slabs{0};
     for (size_t i = 0; i < snmalloc::SIZECLASS_REP_SIZE; i++)
     {
       auto sc = snmalloc::sizeclass_t::from_raw(i);
       auto allocated = *stats[sc].objects_allocated;
       auto deallocated = *stats[sc].objects_deallocated;
+      auto slabs_allocated = *stats[sc].slabs_allocated;
+      auto slabs_deallocated = *stats[sc].slabs_deallocated;
       if (allocated == 0 && deallocated == 0)
         continue;
-      auto size =
-        snmalloc::sizeclass_full_to_size(snmalloc::sizeclass_t::from_raw(i));
+      auto size = snmalloc::sizeclass_full_to_size(sc);
+      auto slab_size = snmalloc::sizeclass_full_to_slab_size(sc);
       auto in_use = allocated - deallocated;
       auto amount = in_use * size;
       total_live += amount;
-      snmalloc::message<1024>("snmalloc_allocs,{},{},{},{},{},{},{}", l_dump, i, size, allocated, deallocated, in_use,amount);
+      auto in_use_slabs = slabs_allocated - slabs_deallocated;
+      auto amount_slabs = in_use_slabs * slab_size;
+      total_live_slabs += amount_slabs;
+
+      snmalloc::message<1024>("snmalloc_allocs,{},{},{},{},{},{},{},{},{},{},{}", l_dump, i, size, allocated, deallocated, in_use, amount, slabs_allocated, slabs_deallocated, in_use_slabs, amount_slabs);
     }
-    snmalloc::message<1024>("snmalloc_totals,{},{},{},{}", l_dump, Config::Backend::get_current_usage(), Config::Backend::get_peak_usage(), total_live);
+    snmalloc::message<1024>("snmalloc_totals,{},{},{},{},{}", l_dump, Config::Backend::get_current_usage(), Config::Backend::get_peak_usage(), total_live, total_live_slabs);
   }
 } // namespace snmalloc

src/snmalloc/mem/localalloc.h

@@ -212,8 +212,11 @@ namespace snmalloc
         }
 
         if (chunk.unsafe_ptr() != nullptr)
-          core_alloc->stats[size_to_sizeclass_full(size)].objects_allocated++;
-
+        {
+          auto sc = size_to_sizeclass_full(size);
+          core_alloc->stats[sc].objects_allocated++;
+          core_alloc->stats[sc].slabs_allocated++;
+        }
         return capptr_chunk_is_alloc(capptr_to_user_address_control(chunk));
       });
     }