Cleanup: Migrate StoreEntry to using MEMPROXY_CLASS

diff --git a/src/Store.h b/src/Store.h
index c147160bc328c80a0abd4b0027d806dfe49d5c0b..d69134eb85cad2a8b2b4f8cc4ec02fe05169be3f 100644 (file)
--- a/src/Store.h
+++ b/src/Store.h
@@ -44,6 +44,7 @@ enum { SwapFilenMax = 0xFFFFFF }; // keep in sync with StoreEntry::swap_filen
 
 class StoreEntry : public hash_link, public Packable
 {
+    MEMPROXY_CLASS(StoreEntry);
 
 public:
     static DeferredRead::DeferrableRead DeferReader;
@@ -178,8 +179,6 @@ public:
         return false;
     };
 
-    void *operator new(size_t byteCount);
-    void operator delete(void *address);
     void setReleaseFlag();
 #if USE_SQUID_ESI
 

diff --git a/src/store.cc b/src/store.cc
index 3e04c45b505f7e20870fb91c670347de8c363c25..168a15ac6118f83c72c3fdbb745b7a37d6854d71 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -149,24 +149,6 @@ Store::unlink(StoreEntry &)
     fatal("Store::unlink on invalid Store\n");
 }
 
-void *
-StoreEntry::operator new (size_t bytecount)
-{
-    assert(bytecount == sizeof (StoreEntry));
-
-    if (!pool) {
-        pool = memPoolCreate ("StoreEntry", bytecount);
-    }
-
-    return pool->alloc();
-}
-
-void
-StoreEntry::operator delete (void *address)
-{
-    pool->freeOne(address);
-}
-
 void
 StoreEntry::makePublic()
 {

diff --git a/src/tests/stub_store.cc b/src/tests/stub_store.cc
index b6713a8e9f1166036ac4ae438fe286d4793894aa..352afde3131ba503716d05f2b7ca4c9ee045ad06 100644 (file)
--- a/src/tests/stub_store.cc
+++ b/src/tests/stub_store.cc
@@ -81,12 +81,6 @@ size_t StoreEntry::inUseCount() STUB_RETVAL(0)
 void StoreEntry::getPublicByRequestMethod(StoreClient * aClient, HttpRequest * request, const HttpRequestMethod& method) STUB
 void StoreEntry::getPublicByRequest(StoreClient * aClient, HttpRequest * request) STUB
 void StoreEntry::getPublic(StoreClient * aClient, const char *uri, const HttpRequestMethod& method) STUB
-void *StoreEntry::operator new(size_t byteCount)
-{
-    STUB
-    return new StoreEntry();
-}
-void StoreEntry::operator delete(void *address) STUB
 void StoreEntry::setReleaseFlag() STUB
 //#if USE_SQUID_ESI
 //ESIElement::Pointer StoreEntry::cachedESITree STUB_RETVAL(NULL)