Update ClassAllocator to require and call destructors on ClassAllocated objects

Author: cmcfarlen

include/proxy/http/Http1ClientSession.h

@@ -130,4 +130,4 @@ class Http1ClientSession : public ProxySession
   Http1ClientTransaction trans;
 };
 
-extern ClassAllocator<Http1ClientSession, true> http1ClientSessionAllocator;
+extern ClassAllocator<Http1ClientSession> http1ClientSessionAllocator;

include/proxy/http/Http1ServerSession.h

@@ -105,7 +105,7 @@ class Http1ServerSession : public PoolableSession
   Http1ServerTransaction trans;
 };
 
-extern ClassAllocator<Http1ServerSession, true> httpServerSessionAllocator;
+extern ClassAllocator<Http1ServerSession> httpServerSessionAllocator;
 
 ////////////////////////////////////////////
 // INLINE

include/proxy/http/PreWarmManager.h

@@ -138,8 +138,7 @@ class PreWarmSM;
 class PreWarmManager;
 class SNIConfigParams;
 
-extern ClassAllocator<PreWarmSM> preWarmSMAllocator;
-extern PreWarmManager            prewarmManager;
+extern PreWarmManager prewarmManager;
 
 /**
    @class PreWarmSM
@@ -230,6 +229,8 @@ class PreWarmSM : public Continuation
   Event          *_retry_event      = nullptr;
 };
 
+extern ClassAllocator<PreWarmSM> preWarmSMAllocator;
+
 /**
    @class PreWarmQueue
    @detail

include/proxy/http2/Http2ClientSession.h

@@ -79,4 +79,4 @@ class Http2ClientSession : public ProxySession, public Http2CommonSession
   IpEndpoint cached_local_addr;
 };
 
-extern ClassAllocator<Http2ClientSession, true> http2ClientSessionAllocator;
+extern ClassAllocator<Http2ClientSession> http2ClientSessionAllocator;

include/proxy/http2/Http2Stream.h

@@ -287,7 +287,7 @@ class Http2Stream : public ProxyTransaction
   Event *_write_vio_event   = nullptr;
 };
 
-extern ClassAllocator<Http2Stream, true> http2StreamAllocator;
+extern ClassAllocator<Http2Stream> http2StreamAllocator;
 
 ////////////////////////////////////////////////////
 // INLINE

include/tscore/Allocator.h

@@ -39,6 +39,7 @@
 
 #pragma once
 
+#include <concepts>
 #include <cstdlib>
 #include <utility>
 #include "tscore/ink_queue.h"
@@ -329,11 +330,10 @@ using Allocator = FreelistAllocator;
   Allocator for Class objects.
 
 */
-template <class C, bool Destruct_on_free_ = false, typename BaseAllocator = Allocator> class ClassAllocator : public BaseAllocator
+template <std::destructible C, typename BaseAllocator = Allocator> class ClassAllocator : public BaseAllocator
 {
 public:
-  using Value_type                   = C;
-  static bool const Destruct_on_free = Destruct_on_free_;
+  using Value_type = C;
 
   /** Allocates objects of the templated type.  Arguments are forwarded to the constructor for the object. */
   template <typename... Args>
@@ -380,21 +380,19 @@ template <class C, bool Destruct_on_free_ = false, typename BaseAllocator = Allo
   void
   destroy_if_enabled(C *ptr)
   {
-    if (Destruct_on_free) {
-      ptr->~C();
-    }
+    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, bool Destruct_on_free = false> class TrackerClassAllocator : public ClassAllocator<C, Destruct_on_free>
+template <class C> class TrackerClassAllocator : public ClassAllocator<C>
 {
 public:
   TrackerClassAllocator(const char *name, unsigned int chunk_size = 128, unsigned int alignment = 16)
-    : ClassAllocator<C, Destruct_on_free>(name, chunk_size, alignment), allocations(0), trackerLock(PTHREAD_MUTEX_INITIALIZER)
+    : ClassAllocator<C>(name, chunk_size, alignment), allocations(0), trackerLock(PTHREAD_MUTEX_INITIALIZER)
   {
   }
 
@@ -403,7 +401,7 @@ template <class C, bool Destruct_on_free = false> class TrackerClassAllocator :
   {
     void *callstack[3];
     int   frames = backtrace(callstack, 3);
-    C    *ptr    = ClassAllocator<C, Destruct_on_free>::alloc();
+    C    *ptr    = ClassAllocator<C>::alloc();
 
     const void *symbol = nullptr;
     if (frames == 3 && callstack[2] != nullptr) {
@@ -429,7 +427,7 @@ template <class C, bool Destruct_on_free = false> class TrackerClassAllocator :
       reverse_lookup.erase(it);
     }
     ink_mutex_release(&trackerLock);
-    ClassAllocator<C, Destruct_on_free>::free(ptr);
+    ClassAllocator<C>::free(ptr);
   }
 
 private:

src/proxy/http/Http1ClientSession.cc

@@ -59,7 +59,7 @@ ink_mutex debug_cs_list_mutex;
 
 #endif /* USE_HTTP_DEBUG_LISTS */
 
-ClassAllocator<Http1ClientSession, true> http1ClientSessionAllocator("http1ClientSessionAllocator");
+ClassAllocator<Http1ClientSession> http1ClientSessionAllocator("http1ClientSessionAllocator");
 
 namespace
 {

src/proxy/http/Http1ServerSession.cc

@@ -36,7 +36,7 @@
 #include "proxy/http/HttpSessionManager.h"
 #include "proxy/http/HttpSM.h"
 
-ClassAllocator<Http1ServerSession, true> httpServerSessionAllocator("httpServerSessionAllocator");
+ClassAllocator<Http1ServerSession> httpServerSessionAllocator("httpServerSessionAllocator");
 
 namespace
 {

src/proxy/http2/Http2ClientSession.cc

@@ -29,7 +29,7 @@
 #include "iocore/net/TLSSNISupport.h"
 #include "iocore/net/TLSEarlyDataSupport.h"
 
-ClassAllocator<Http2ClientSession, true> http2ClientSessionAllocator("http2ClientSessionAllocator");
+ClassAllocator<Http2ClientSession> http2ClientSessionAllocator("http2ClientSessionAllocator");
 
 namespace
 {

src/proxy/http2/Http2Stream.cc

@@ -49,7 +49,7 @@ DbgCtl dbg_ctl_http2_stream{"http2_stream"};
 #define Http2StreamDebug(fmt, ...) \
   SsnDbg(_proxy_ssn, dbg_ctl_http2_stream, "[%" PRId64 "] [%u] " fmt, _proxy_ssn->connection_id(), this->get_id(), ##__VA_ARGS__);
 
-ClassAllocator<Http2Stream, true> http2StreamAllocator("http2StreamAllocator");
+ClassAllocator<Http2Stream> http2StreamAllocator("http2StreamAllocator");
 
 Http2Stream::Http2Stream(ProxySession *session, Http2StreamId sid, ssize_t initial_peer_rwnd, ssize_t initial_local_rwnd,
                          bool registered_stream)