restore destruct flag but invert default

Author: cmcfarlen

include/iocore/eventsystem/Event.h

@@ -280,7 +280,7 @@ class Event : public Action
 //
 // Event Allocator
 //
-extern ClassAllocator<Event> eventAllocator;
+extern ClassAllocator<Event, false> eventAllocator;
 
 #define EVENT_ALLOC(_a, _t) THREAD_ALLOC(_a, _t)
 #define EVENT_FREE(_p, _a, _t) \

include/iocore/eventsystem/IOBuffer.h

@@ -251,7 +251,7 @@ class IOBufferData : public RefCountObj
   IOBufferData &operator=(const IOBufferData &) = delete;
 };
 
-extern ClassAllocator<IOBufferData> ioDataAllocator;
+extern ClassAllocator<IOBufferData, false> ioDataAllocator;
 
 /**
   A linkable portion of IOBufferData. IOBufferBlock is a chainable
@@ -494,7 +494,7 @@ class IOBufferBlock : public RefCountObj
   IOBufferBlock &operator=(const IOBufferBlock &) = delete;
 };
 
-extern ClassAllocator<IOBufferBlock> ioBlockAllocator;
+extern ClassAllocator<IOBufferBlock, false> ioBlockAllocator;
 
 /** A class for holding a chain of IO buffer blocks.
     This class is intended to be used as a member variable for other classes that

include/iocore/eventsystem/Lock.h

@@ -247,7 +247,7 @@ class ProxyMutex : public RefCountObj
 };
 
 // The ClassAllocator for ProxyMutexes
-extern ClassAllocator<ProxyMutex> mutexAllocator;
+extern ClassAllocator<ProxyMutex, false> mutexAllocator;
 
 inline bool
 Mutex_trylock(

include/iocore/utils/OneWayMultiTunnel.h

@@ -131,4 +131,4 @@ struct OneWayMultiTunnel : public OneWayTunnel {
   VIO              *vioTargets[ONE_WAY_MULTI_TUNNEL_LIMIT];
 };
 
-extern ClassAllocator<OneWayMultiTunnel> OneWayMultiTunnelAllocator;
+extern ClassAllocator<OneWayMultiTunnel, false> OneWayMultiTunnelAllocator;

include/proxy/http/PreWarmManager.h

@@ -229,7 +229,7 @@ class PreWarmSM : public Continuation
   Event          *_retry_event      = nullptr;
 };
 
-extern ClassAllocator<PreWarmSM> preWarmSMAllocator;
+extern ClassAllocator<PreWarmSM, false> preWarmSMAllocator;
 
 /**
    @class PreWarmQueue

include/proxy/http2/Http2ServerSession.h

@@ -103,4 +103,4 @@ class Http2ServerSession : public PoolableSession, public Http2CommonSession
   bool in_session_table = false;
 };
 
-extern ClassAllocator<Http2ServerSession> http2ServerSessionAllocator;
+extern ClassAllocator<Http2ServerSession, false> http2ServerSessionAllocator;

include/proxy/http3/Http3Frame.h

@@ -175,10 +175,10 @@ using Http3FrameUPtr        = std::unique_ptr<Http3Frame, Http3FrameDeleterFunc>
 using Http3DataFrameUPtr    = std::unique_ptr<Http3DataFrame, Http3FrameDeleterFunc>;
 using Http3HeadersFrameUPtr = std::unique_ptr<Http3HeadersFrame, Http3FrameDeleterFunc>;
 
-extern ClassAllocator<Http3Frame>         http3FrameAllocator;
-extern ClassAllocator<Http3DataFrame>     http3DataFrameAllocator;
-extern ClassAllocator<Http3HeadersFrame>  http3HeadersFrameAllocator;
-extern ClassAllocator<Http3SettingsFrame> http3SettingsFrameAllocator;
+extern ClassAllocator<Http3Frame, false>         http3FrameAllocator;
+extern ClassAllocator<Http3DataFrame, false>     http3DataFrameAllocator;
+extern ClassAllocator<Http3HeadersFrame, false>  http3HeadersFrameAllocator;
+extern ClassAllocator<Http3SettingsFrame, false> http3SettingsFrameAllocator;
 
 class Http3FrameDeleter
 {

include/tscore/Allocator.h

@@ -330,10 +330,12 @@ using Allocator = FreelistAllocator;
   Allocator for Class objects.
 
 */
-template <std::destructible C, typename BaseAllocator = Allocator> class ClassAllocator : public BaseAllocator
+template <std::destructible C, bool Destruct_on_free_ = true, typename BaseAllocator = Allocator>
+class ClassAllocator : public BaseAllocator
 {
 public:
-  using Value_type = C;
+  using Value_type                   = C;
+  static bool const Destruct_on_free = Destruct_on_free_;
 
   /** Allocates objects of the templated type.  Arguments are forwarded to the constructor for the object. */
   template <typename... Args>
@@ -380,19 +382,21 @@ template <std::destructible C, typename BaseAllocator = Allocator> class ClassAl
   void
   destroy_if_enabled(C *ptr)
   {
-    std::destroy_at(ptr);
+    if constexpr (Destruct_on_free) {
+      std::destroy_at(ptr);
+    }
   }
 
   // Ensure that C is big enough to hold a void pointer (when it's stored in the free list as raw memory).
   //
   static_assert(sizeof(C) >= sizeof(void *), "Can not allocate instances of this class using ClassAllocator");
 };
 
-template <class C> class TrackerClassAllocator : public ClassAllocator<C>
+template <class C, bool Destruct_on_free = true> class TrackerClassAllocator : public ClassAllocator<C, Destruct_on_free>
 {
 public:
   TrackerClassAllocator(const char *name, unsigned int chunk_size = 128, unsigned int alignment = 16)
-    : ClassAllocator<C>(name, chunk_size, alignment), allocations(0), trackerLock(PTHREAD_MUTEX_INITIALIZER)
+    : ClassAllocator<C, Destruct_on_free>(name, chunk_size, alignment), allocations(0), trackerLock(PTHREAD_MUTEX_INITIALIZER)
   {
   }
 
@@ -401,7 +405,7 @@ template <class C> class TrackerClassAllocator : public ClassAllocator<C>
   {
     void *callstack[3];
     int   frames = backtrace(callstack, 3);
-    C    *ptr    = ClassAllocator<C>::alloc();
+    C    *ptr    = ClassAllocator<C, Destruct_on_free>::alloc();
 
     const void *symbol = nullptr;
     if (frames == 3 && callstack[2] != nullptr) {
@@ -427,7 +431,7 @@ template <class C> class TrackerClassAllocator : public ClassAllocator<C>
       reverse_lookup.erase(it);
     }
     ink_mutex_release(&trackerLock);
-    ClassAllocator<C>::free(ptr);
+    ClassAllocator<C, Destruct_on_free>::free(ptr);
   }
 
 private:

plugins/experimental/memcache/tsmemcache.cc

@@ -37,7 +37,7 @@
 #define REALTIME_MAXDELTA       60 * 60 * 24 * 30
 #define STRCMP_REST(_c, _s, _e) (((_e) - (_s)) < (int)sizeof(_c) || STRCMP(_s, _c) || !isspace((_s)[sizeof(_c) - 1]))
 
-ClassAllocator<MC> theMCAllocator("MC");
+ClassAllocator<MC, false> theMCAllocator("MC");
 
 static time_t base_day_time;
 

plugins/header_rewrite/matcher_tests.cc

@@ -83,7 +83,7 @@ TSHttpTxnServerRespGet(TSHttpTxn, TSMBuffer *, TSMLoc *)
   return TS_SUCCESS;
 }
 
-ClassAllocator<ProxyMutex> mutexAllocator("mutexAllocator");
+ClassAllocator<ProxyMutex, false> mutexAllocator("mutexAllocator");
 
 TEST_CASE("Matcher", "[plugins][header_rewrite]")
 {