Fix stl

Author: mjp41

src/snmalloc/ds_core/stats.h

@@ -18,8 +18,9 @@ namespace snmalloc
   public:
     void increase(size_t amount)
     {
-      size_t c = (curr += amount);
-      size_t p = peak.load(std::memory_order_relaxed);
+      size_t old = curr.fetch_add(amount);
+      size_t c = old + amount;
+      size_t p = peak.load(stl::memory_order_relaxed);
       while (c > p)
       {
         if (peak.compare_exchange_strong(p, c))
@@ -37,12 +38,12 @@ namespace snmalloc
 
     size_t get_curr()
     {
-      return curr.load(std::memory_order_relaxed);
+      return curr.load(stl::memory_order_relaxed);
     }
 
     size_t get_peak()
     {
-      return peak.load(std::memory_order_relaxed);
+      return peak.load(stl::memory_order_relaxed);
     }
 
     void operator+=(size_t amount)
@@ -71,28 +72,28 @@ namespace snmalloc
    */
   class MonotoneLocalStat
   {
-    std::atomic<size_t> value{0};
+    stl::Atomic<size_t> value{0};
 
   public:
     void operator++(int)
     {
-      value.fetch_add(1, std::memory_order_relaxed);
+      value.fetch_add(1, stl::memory_order_relaxed);
     }
 
     void operator+=(const MonotoneLocalStat& other)
     {
-      auto v = other.value.load(std::memory_order_relaxed);
-      value.fetch_add(v, std::memory_order_relaxed);
+      auto v = other.value.load(stl::memory_order_relaxed);
+      value.fetch_add(v, stl::memory_order_relaxed);
     }
 
     void operator+=(size_t v)
     {
-      value.fetch_add(v, std::memory_order_relaxed);
+      value.fetch_add(v, stl::memory_order_relaxed);
     }
 
     size_t operator*()
     {
-      return value.load(std::memory_order_relaxed);
+      return value.load(stl::memory_order_relaxed);
     }
   };
 } // namespace snmalloc

src/snmalloc/global/globalalloc.h

@@ -147,7 +147,7 @@ namespace snmalloc
   template<SNMALLOC_CONCEPT(IsConfig) Config_ = Config>
   inline static void print_alloc_stats()
   {
-    static std::atomic<size_t> dump{0};
+    static stl::Atomic<size_t> dump{0};
 
     auto l_dump = dump++;
     if (l_dump == 0)

src/snmalloc/mem/pool.h

@@ -32,14 +32,14 @@ namespace snmalloc
 
     FlagWord lock{};
     capptr::Alloc<T> list{nullptr};
-    std::atomic<size_t> count{0};
+    stl::Atomic<size_t> count{0};
 
   public:
     constexpr PoolState() = default;
 
     size_t get_count()
     {
-      return count.load(std::memory_order_relaxed);
+      return count.load(stl::memory_order_relaxed);
     }
   };
 

src/snmalloc/stl/gnu/atomic.h

@@ -89,7 +89,7 @@ namespace snmalloc
         return load();
       }
 
-      SNMALLOC_FAST_PATH T load(MemoryOrder mem_ord = MemoryOrder::SEQ_CST)
+      SNMALLOC_FAST_PATH T load(MemoryOrder mem_ord = MemoryOrder::SEQ_CST) const
       {
         T res;
         __atomic_load(addressof(val), addressof(res), order(mem_ord));