Unify PMR allocation counting with global operator new tracking

Author: sgerbino

bench/beman/allocation_tracker.hpp

@@ -13,10 +13,42 @@
 #include <atomic>
 #include <cstddef>
 #include <cstdlib>
+#include <memory_resource>
 #include <new>
 
 static std::atomic<int64_t> g_alloc_count{0};
 
+/// Counts every allocate call, then delegates to upstream.
+class counting_memory_resource
+    : public std::pmr::memory_resource
+{
+    std::pmr::memory_resource* upstream_;
+
+    void* do_allocate(
+        std::size_t n, std::size_t align) override
+    {
+        g_alloc_count.fetch_add(1, std::memory_order_relaxed);
+        return upstream_->allocate(n, align);
+    }
+
+    void do_deallocate(
+        void* p, std::size_t n, std::size_t align) override
+    {
+        upstream_->deallocate(p, n, align);
+    }
+
+    bool do_is_equal(
+        memory_resource const& other) const noexcept override
+    {
+        return this == &other;
+    }
+
+public:
+    explicit counting_memory_resource(
+        std::pmr::memory_resource* upstream) noexcept
+        : upstream_(upstream) {}
+};
+
 void* operator new(std::size_t n)
 {
     g_alloc_count.fetch_add(1, std::memory_order_relaxed);

bench/beman/main.cpp

@@ -47,6 +47,14 @@
 namespace bex = beman::execution;
 namespace capy = boost::capy;
 
+static counting_memory_resource g_counting_resource{
+    capy::get_recycling_memory_resource()};
+
+auto get_counting_resource() -> std::pmr::memory_resource*
+{
+    return &g_counting_resource;
+}
+
 // ===================================================================
 // result collection
 // ===================================================================
@@ -522,7 +530,7 @@ int main()
         sender_thread_pool pool(1);
         sndr_read_stream stream{&pool};
         auto sched = pool.get_scheduler();
-        auto* mr = capy::get_recycling_memory_resource();
+        auto* mr = get_counting_resource();
         bex::sync_wait(bex::starts_on(sched,
             bex_accept(
                 stream, grid[run][BEMAN_TASK][NATIVE_STREAM][NATIVE_EXEC_MODEL],
@@ -536,7 +544,7 @@ int main()
         sender_thread_pool pool(1);
         sndr_io_read_stream_impl stream{&pool};
         auto sched = pool.get_scheduler();
-        auto* mr = capy::get_recycling_memory_resource();
+        auto* mr = get_counting_resource();
         bex::sync_wait(bex::starts_on(sched,
             bex_accept(
                 static_cast<sndr_io_read_stream&>(stream),
@@ -551,7 +559,7 @@ int main()
         sender_thread_pool pool(1);
         sndr_any_read_stream stream(sndr_read_stream{&pool});
         auto sched = pool.get_scheduler();
-        auto* mr = capy::get_recycling_memory_resource();
+        auto* mr = get_counting_resource();
         bex::sync_wait(bex::starts_on(sched,
             bex_accept(
                 stream, grid[run][BEMAN_TASK][TYPE_ERASED_STREAM][NATIVE_EXEC_MODEL],
@@ -565,7 +573,7 @@ int main()
         sender_thread_pool pool(1);
         sndr_sync_read_stream stream;
         auto sched = pool.get_scheduler();
-        auto* mr = capy::get_recycling_memory_resource();
+        auto* mr = get_counting_resource();
         bex::sync_wait(bex::starts_on(sched,
             bex_accept(
                 stream, grid[run][BEMAN_TASK][SYNC_STREAM][NATIVE_EXEC_MODEL],
@@ -581,7 +589,7 @@ int main()
         sender_thread_pool pool(1);
         ioaw_read_stream stream;
         auto sched = pool.get_scheduler();
-        auto* mr = capy::get_recycling_memory_resource();
+        auto* mr = get_counting_resource();
         bex::sync_wait(bex::starts_on(sched,
             bex_accept_ioaw(
                 stream, grid[run][BEMAN_TASK][NATIVE_STREAM][BRIDGED_EXEC_MODEL],
@@ -595,7 +603,7 @@ int main()
         sender_thread_pool pool(1);
         ioaw_io_read_stream_impl stream;
         auto sched = pool.get_scheduler();
-        auto* mr = capy::get_recycling_memory_resource();
+        auto* mr = get_counting_resource();
         bex::sync_wait(bex::starts_on(sched,
             bex_accept_ioaw(
                 static_cast<ioaw_io_read_stream&>(stream),
@@ -611,7 +619,7 @@ int main()
         ioaw_read_stream concrete;
         capy::any_read_stream stream(&concrete);
         auto sched = pool.get_scheduler();
-        auto* mr = capy::get_recycling_memory_resource();
+        auto* mr = get_counting_resource();
         bex::sync_wait(bex::starts_on(sched,
             bex_accept_ioaw(
                 stream, grid[run][BEMAN_TASK][TYPE_ERASED_STREAM][BRIDGED_EXEC_MODEL],
@@ -625,7 +633,7 @@ int main()
         sender_thread_pool pool(1);
         ioaw_sync_read_stream stream;
         auto sched = pool.get_scheduler();
-        auto* mr = capy::get_recycling_memory_resource();
+        auto* mr = get_counting_resource();
         bex::sync_wait(bex::starts_on(sched,
             bex_accept_ioaw(
                 stream, grid[run][BEMAN_TASK][SYNC_STREAM][BRIDGED_EXEC_MODEL],

bench/beman/sndr_any_read_sender.hpp

@@ -18,16 +18,17 @@
 #ifndef BOOST_CAPY_BENCH_SNDR_ANY_READ_SENDER_HPP
 #define BOOST_CAPY_BENCH_SNDR_ANY_READ_SENDER_HPP
 
-#include <boost/capy/ex/recycling_memory_resource.hpp>
-
 #include <beman/execution/execution.hpp>
 
 #include <coroutine>
 #include <cstddef>
 #include <cstring>
 #include <memory>
+#include <memory_resource>
 #include <utility>
 
+auto get_counting_resource() -> std::pmr::memory_resource*;
+
 namespace ex = beman::execution;
 
 class sndr_any_read_sender
@@ -37,13 +38,13 @@ class sndr_any_read_sender
     {
         static void* operator new(std::size_t n)
         {
-            return boost::capy::get_recycling_memory_resource()
+            return get_counting_resource()
                 ->allocate(n, alignof(std::max_align_t));
         }
 
         static void operator delete(void* p, std::size_t n) noexcept
         {
-            boost::capy::get_recycling_memory_resource()
+            get_counting_resource()
                 ->deallocate(p, n, alignof(std::max_align_t));
         }