/*
- * Copyright (C) 1996-2019 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.
#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 {
}
}
-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
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;
* 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;
}
LruNode *lru_node = lru_walk->current;
if (!lru_node)
- return NULL;
+ return nullptr;
lru_walk->current = (LruNode *) lru_node->node.next;
lru_node = lru_walker->current;
if (!lru_node || walker->scanned >= walker->max_scan)
- return NULL;
+ return nullptr;
walker->scanned += 1;
if (lru_walker->current == lru_walker->start) {
/* Last node found */
- lru_walker->current = NULL;
+ lru_walker->current = nullptr;
}
entry = (StoreEntry *) lru_node->node.data;
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;
}
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));