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 90e845313ed4279a7bc6fd8466882f9c7d0df7d5..98c2053bc4d527d03d9446341a05a76758dbb426 100644 (file)
--- a/src/repl/lru/store_repl_lru.cc
+++ b/src/repl/lru/store_repl_lru.cc
@@ -1,42 +1,16 @@
-
 /*
- * $Id: store_repl_lru.cc,v 1.22 2007/04/25 11:30:19 adrian Exp $
- *
- * DEBUG: none          LRU Removal Policy
- * AUTHOR: Henrik Nordstrom
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ * 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.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+/* DEBUG: none          LRU Removal Policy */
+
 #include "squid.h"
-#include "Store.h"
 #include "MemObject.h"
-#include "SquidTime.h"
+#include "Store.h"
 
 REMOVALPOLICYCREATE createRemovalPolicy_lru;
 
@@ -86,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
@@ -104,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;
 
@@ -126,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->free(lru_node);
+    delete lru_node;
 
     lru->count -= 1;
 }
@@ -170,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;
 
@@ -228,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;
 
@@ -236,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;
@@ -244,14 +219,14 @@ try_again:
 
     if (entry->locked()) {
         /* Shit, it is locked. we can't return this one */
-        walker->locked++;
+        ++ walker->locked;
         dlinkAddTail(entry, &lru_node->node, &lru->list);
         goto try_again;
     }
 
-    lru_node_pool->free(lru_node);
+    delete lru_node;
     lru->count -= 1;
-    lru->setPolicyNode(entry, NULL);
+    lru->setPolicyNode(entry, nullptr);
     return entry;
 }
 
@@ -326,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));
@@ -368,3 +336,4 @@ createRemovalPolicy_lru(wordlist * args)
 
     return policy;
 }
+