CR and CI changes

Author: mjp41

src/snmalloc/backend_helpers/statsrange.h

@@ -28,15 +28,15 @@ namespace snmalloc
 
       constexpr Type() = default;
 
-      capptr::Arena<void> alloc_range(size_t size)
+      CapPtr<void, ChunkBounds> alloc_range(size_t size)
       {
         auto r = parent.alloc_range(size);
         if (r != nullptr)
           usage += size;
         return r;
       }
 
-      void dealloc_range(capptr::Arena<void> base, size_t size)
+      void dealloc_range(CapPtr<void, ChunkBounds> base, size_t size)
       {
         usage -= size;
         parent.dealloc_range(base, size);

src/snmalloc/ds_core/stats.h

@@ -29,9 +29,8 @@ namespace snmalloc
     void decrease(size_t amount)
     {
       size_t prev = curr.fetch_sub(amount);
-      // TODO Fix this to be true.
-      //      SNMALLOC_ASSERT_MSG(prev >= amount, "prev = {}, amount = {}",
-      //      prev, amount);
+      SNMALLOC_ASSERT_MSG(
+        prev >= amount, "prev = {}, amount = {}", prev, amount);
       UNUSED(prev);
     }
 
@@ -65,4 +64,28 @@ namespace snmalloc
       decrease(1);
     }
   };
+
+  /**
+   * Very basic statistic that can only grow.  Not thread-safe.
+   */
+  class MonotoneLocalStat
+  {
+    size_t value{0};
+
+  public:
+    void operator++(int)
+    {
+      value++;
+    }
+
+    void operator+=(const MonotoneLocalStat& other)
+    {
+      value += other.value;
+    }
+
+    size_t operator*()
+    {
+      return value;
+    }
+  };
 } // namespace snmalloc

src/snmalloc/mem/allocstats.h

@@ -5,33 +5,12 @@
 
 namespace snmalloc
 {
-  class MonotoneStat
-  {
-    size_t value{0};
-
-  public:
-    void operator++(int)
-    {
-      value++;
-    }
-
-    void operator+=(const MonotoneStat& other)
-    {
-      value += other.value;
-    }
-
-    size_t operator*()
-    {
-      return value;
-    }
-  };
-
   struct AllocStat
   {
-    MonotoneStat objects_allocated{};
-    MonotoneStat objects_deallocated{};
-    MonotoneStat slabs_allocated{};
-    MonotoneStat slabs_deallocated{};
+    MonotoneLocalStat objects_allocated{};
+    MonotoneLocalStat objects_deallocated{};
+    MonotoneLocalStat slabs_allocated{};
+    MonotoneLocalStat slabs_deallocated{};
   };
 
   class AllocStats

src/snmalloc/mem/corealloc.h

@@ -558,7 +558,7 @@ namespace snmalloc
       }
       else
       {
-        need_post = attached_cache->remote_dealloc_cache.reserve_space(entry);
+        need_post |= attached_cache->remote_dealloc_cache.reserve_space(entry);
         attached_cache->remote_dealloc_cache
           .template dealloc<sizeof(CoreAllocator)>(
             entry.get_remote()->trunc_id(), p.as_void());

src/test/perf/churn/churn.cc

@@ -9,12 +9,13 @@ int main()
   std::vector<std::thread> threads;
   std::atomic<size_t> running;
   snmalloc::Stat requests;
+  std::atomic<bool> done{false};
 
   for (size_t i = 0; i < 16; i++)
   {
-    std::thread([&running, &requests]() {
+    threads.push_back(std::thread([&running, &requests, &done]() {
       std::queue<size_t*> q;
-      while (true)
+      while (!done)
       {
         snmalloc::ScopedAllocator alloc;
         running++;
@@ -54,7 +55,7 @@ int main()
         running--;
         std::this_thread::sleep_for(std::chrono::microseconds(rand() % 2000));
       }
-    }).detach();
+    }));
   }
 
   std::thread([&requests]() {
@@ -84,5 +85,10 @@ int main()
     }
   }).join();
 
+  done = true;
+
+  for (auto& t : threads)
+    t.join();
+
   return 0;
 }