Use an atomic unique_ptr for the device's context array

2 files changed, 4 insertions, 15 deletions

diff --git a/core/device.cpp b/core/device.cpp
index a5edf63c..795a9601 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -12,15 +12,9 @@
 static_assert(std::atomic<std::chrono::nanoseconds>::is_always_lock_free);
 
 
-al::FlexArray<ContextBase*> DeviceBase::sEmptyContextArray{0u};
-
-
-DeviceBase::DeviceBase(DeviceType type) : Type{type}, mContexts{&sEmptyContextArray}
+DeviceBase::DeviceBase(DeviceType type)
+    : Type{type}, mContexts{al::FlexArray<ContextBase*>::Create(0)}
 {
 }
 
-DeviceBase::~DeviceBase()
-{
-    auto *oldarray = mContexts.exchange(nullptr, std::memory_order_relaxed);
-    if(oldarray != &sEmptyContextArray) delete oldarray;
-}
+DeviceBase::~DeviceBase() = default;
diff --git a/core/device.h b/core/device.h
index 9ee07454..1da08727 100644
--- a/core/device.h
+++ b/core/device.h
@@ -181,11 +181,6 @@ enum class DeviceState : uint8_t {
 };
 
 struct DeviceBase {
-    /* To avoid extraneous allocations, a 0-sized FlexArray<ContextBase*> is
-     * defined globally as a sharable object.
-     */
-    static al::FlexArray<ContextBase*> sEmptyContextArray;
-
     std::atomic<bool> Connected{true};
     const DeviceType Type{};
 
@@ -295,7 +290,7 @@ struct DeviceBase {
     std::atomic<uint> mMixCount{0u};
 
     // Contexts created on this device
-    std::atomic<al::FlexArray<ContextBase*>*> mContexts{nullptr};
+    al::atomic_unique_ptr<al::FlexArray<ContextBase*>> mContexts;
 
 
     DeviceBase(DeviceType type);