Refactor dlink_node to MEMPROXY_CLASS

diff --git a/src/auth/digest/Config.cc b/src/auth/digest/Config.cc
index 011cfca6ae9fd77298739a790e240c6fa7803dc4..dda1cb60b16dd24f08683795e73b1fb1fc48497d 100644 (file)
--- a/src/auth/digest/Config.cc
+++ b/src/auth/digest/Config.cc
@@ -672,7 +672,7 @@ authDigestNonceUserUnlink(digest_nonce_h * nonce)
         if (tmplink->data == nonce) {
             dlinkDelete(tmplink, &digest_user->nonces);
             authDigestNonceUnlink(static_cast < digest_nonce_h * >(tmplink->data));
-            dlinkNodeDelete(tmplink);
+            delete tmplink;
             link = NULL;
         }
     }
@@ -702,7 +702,7 @@ authDigestUserLinkNonce(Auth::Digest::User * user, digest_nonce_h * nonce)
     if (node)
         return;
 
-    node = dlinkNodeNew();
+    node = new dlink_node;
 
     dlinkAddTail(nonce, node, &digest_user->nonces);
 

diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc
index 46d9006b947d70a706ff17c94174ee2ea857bc6b..143f493c56e3b61084e5beddeb4f8bdd9890ab0c 100644 (file)
--- a/src/auth/digest/User.cc
+++ b/src/auth/digest/User.cc
@@ -32,7 +32,7 @@ Auth::Digest::User::~User()
         dlinkDelete(tmplink, &nonces);
         authDigestNoncePurge(static_cast < digest_nonce_h * >(tmplink->data));
         authDigestNonceUnlink(static_cast < digest_nonce_h * >(tmplink->data));
-        dlinkNodeDelete(tmplink);
+        delete tmplink;
     }
 }
 

diff --git a/src/dlink.cc b/src/dlink.cc
index 656aa0a1d17d359a49940368914c9b250c0f6d03..478ac4163f39ff7be13b7b0fb985418d302aaa3b 100644 (file)
--- a/src/dlink.cc
+++ b/src/dlink.cc
@@ -9,35 +9,8 @@
 #include "squid.h"
 #include "dlink.h"
 
-/* dlink_node use explicit alloc()/freeOne()
- * XXX: convert to MEMPROXY_CLASS() API
- */
-#include "mem/Pool.h"
-
 dlink_list ClientActiveRequests;
 
-MemAllocator *dlink_node_pool = NULL;
-
-dlink_node *
-dlinkNodeNew()
-{
-    if (dlink_node_pool == NULL)
-        dlink_node_pool = memPoolCreate("Dlink list nodes", sizeof(dlink_node));
-
-    /* where should we call delete dlink_node_pool;dlink_node_pool = NULL; */
-    return (dlink_node *)dlink_node_pool->alloc();
-}
-
-/** The node needs to be unlinked FIRST */
-void
-dlinkNodeDelete(dlink_node * m)
-{
-    if (m == NULL)
-        return;
-
-    dlink_node_pool->freeOne(m);
-}
-
 void
 dlinkAdd(void *data, dlink_node * m, dlink_list * list)
 {

diff --git a/src/dlink.h b/src/dlink.h
index 65b3915249cb5d561511b97ece78f07702e28bb3..3d951a125bb573f14ec5a4b17fd26c2eae259bb0 100644 (file)
--- a/src/dlink.h
+++ b/src/dlink.h
@@ -9,11 +9,13 @@
 #ifndef SQUID_DLINK_H
 #define SQUID_DLINK_H
 
+#include "mem/forward.h"
+
 class dlink_node
 {
-
+       MEMPROXY_CLASS(dlink_node);
 public:
-    dlink_node() : data(NULL), prev(NULL), next(NULL) {}
+    dlink_node() : data(nullptr), prev(nullptr), next(nullptr) {}
 
     void *data;
     dlink_node *prev;
@@ -35,8 +37,6 @@ void dlinkAdd(void *data, dlink_node *, dlink_list *);
 void dlinkAddAfter(void *, dlink_node *, dlink_node *, dlink_list *);
 void dlinkAddTail(void *data, dlink_node *, dlink_list *);
 void dlinkDelete(dlink_node * m, dlink_list * list);
-void dlinkNodeDelete(dlink_node * m);
-dlink_node *dlinkNodeNew(void);
 
 #endif /* SQUID_DLINK_H */
 

diff --git a/test-suite/test_tools.cc b/test-suite/test_tools.cc
index 009833c5027c20a7474781e55f2e6a73ce213a50..73eb3604495f858c5197f952692fe38fabcf94a4 100644 (file)
--- a/test-suite/test_tools.cc
+++ b/test-suite/test_tools.cc
@@ -20,22 +20,6 @@ xassert(const char *msg, const char *file, int line)
     exit (1);
 }
 
-dlink_node *
-dlinkNodeNew()
-{
-    return new dlink_node;
-}
-
-/* the node needs to be unlinked FIRST */
-void
-dlinkNodeDelete(dlink_node * m)
-{
-    if (m == NULL)
-        return;
-
-    delete m;
-}
-
 void
 dlinkAdd(void *data, dlink_node * m, dlink_list * list)
 {