Source Format Enforcement (#1234)

[thirdparty/squid.git] / src / repl / lru / store_repl_lru.cc

diff --git a/src/repl/lru/store_repl_lru.cc b/src/repl/lru/store_repl_lru.cc
index 9584bbc3d97b560521a39938a8104fe069af15a1..98c2053bc4d527d03d9446341a05a76758dbb426 100644 (file)
--- a/src/repl/lru/store_repl_lru.cc
+++ b/src/repl/lru/store_repl_lru.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -10,14 +10,8 @@
 
 #include "squid.h"
 #include "MemObject.h"
-#include "SquidTime.h"
 #include "Store.h"
 
-/* because LruNode use explicit memory alloc()/freeOne() calls.
- * XXX: convert to MEMPROXY_CLASS() API
- */
-#include "mem/Pool.h"
-
 REMOVALPOLICYCREATE createRemovalPolicy_lru;
 
 struct LruPolicyData {
@@ -66,16 +60,17 @@ LruPolicyData::setPolicyNode (StoreEntry *entry, void *value) const
     }
 }
 
-typedef struct _LruNode LruNode;
+class LruNode
+{
+    MEMPROXY_CLASS(LruNode);
 
-struct _LruNode {
+public:
     /* Note: the dlink_node MUST be the first member of the LruNode
      * structure. This member is later pointer typecasted to LruNode *.
      */
     dlink_node node;
 };
 
-static MemAllocator *lru_node_pool = NULL;
 static int nr_lru_policies = 0;
 
 static void
@@ -84,7 +79,7 @@ lru_add(RemovalPolicy * policy, StoreEntry * entry, RemovalPolicyNode * node)
     LruPolicyData *lru = (LruPolicyData *)policy->_data;
     LruNode *lru_node;
     assert(!node->data);
-    node->data = lru_node = (LruNode *)lru_node_pool->alloc();
+    node->data = lru_node = new LruNode;
     dlinkAddTail(entry, &lru_node->node, &lru->list);
     lru->count += 1;
 
@@ -106,16 +101,16 @@ lru_remove(RemovalPolicy * policy, StoreEntry * entry, RemovalPolicyNode * node)
      * but not be in the LRU list, so check for that case rather
      * than suffer a NULL pointer access.
      */
-    if (NULL == lru_node->node.data)
+    if (nullptr == lru_node->node.data)
         return;
 
     assert(lru_node->node.data == entry);
 
-    node->data = NULL;
+    node->data = nullptr;
 
     dlinkDelete(&lru_node->node, &lru->list);
 
-    lru_node_pool->freeOne(lru_node);
+    delete lru_node;
 
     lru->count -= 1;
 }
@@ -150,7 +145,7 @@ lru_walkNext(RemovalPolicyWalker * walker)
     LruNode *lru_node = lru_walk->current;
 
     if (!lru_node)
-        return NULL;
+        return nullptr;
 
     lru_walk->current = (LruNode *) lru_node->node.next;
 
@@ -208,7 +203,7 @@ try_again:
     lru_node = lru_walker->current;
 
     if (!lru_node || walker->scanned >= walker->max_scan)
-        return NULL;
+        return nullptr;
 
     walker->scanned += 1;
 
@@ -216,7 +211,7 @@ try_again:
 
     if (lru_walker->current == lru_walker->start) {
         /* Last node found */
-        lru_walker->current = NULL;
+        lru_walker->current = nullptr;
     }
 
     entry = (StoreEntry *) lru_node->node.data;
@@ -229,9 +224,9 @@ try_again:
         goto try_again;
     }
 
-    lru_node_pool->freeOne(lru_node);
+    delete lru_node;
     lru->count -= 1;
-    lru->setPolicyNode(entry, NULL);
+    lru->setPolicyNode(entry, nullptr);
     return entry;
 }
 
@@ -306,13 +301,6 @@ createRemovalPolicy_lru(wordlist * args)
     LruPolicyData *lru_data;
     /* no arguments expected or understood */
     assert(!args);
-    /* Initialize */
-
-    if (!lru_node_pool) {
-        /* Must be chunked */
-        lru_node_pool = memPoolCreate("LRU policy node", sizeof(LruNode));
-        lru_node_pool->setChunkSize(512 * 1024);
-    }
 
     /* Allocate the needed structures */
     lru_data = (LruPolicyData *)xcalloc(1, sizeof(*lru_data));