From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Mon, 7 Feb 2011 18:48:40 +0000 (-0700)
Subject: Do not create an unused replacement policy and stuff it with entries
X-Git-Tag: take02~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e2402355c4095b7e24b18f00276c1b49b2ed728;p=thirdparty%2Fsquid.git

Do not create an unused replacement policy and stuff it with entries
because those entries will leak since maintain() is disabled.
---

diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc
index f131875566..701f22d3df 100644
--- a/src/fs/rock/RockSwapDir.cc
+++ b/src/fs/rock/RockSwapDir.cc
@@ -220,7 +220,7 @@ Rock::SwapDir::parse(int anIndex, char *aPath)
     parseSize();
     parseOptions(0);
 
-    repl = createRemovalPolicy(Config.replPolicy);
+    assert(!repl); // repl = createRemovalPolicy(Config.replPolicy);
 
     validateOptions();
 }
@@ -281,12 +281,6 @@ Rock::SwapDir::validateOptions()
 	}
     */
 
-    if (!repl) {
-        debugs(47,0, "ERROR: Rock cache_dir[" << index << "] " <<
-            "lacks replacement policy and will overflow.");
-        // not fatal because it can be added later
-	}
-
     // XXX: misplaced, map is not yet created
     //cur_size = (HeaderSize + max_objsize * map->entryCount()) >> 10;
 }
@@ -584,7 +578,7 @@ void
 Rock::SwapDir::reference(StoreEntry &e)
 {
     debugs(47, 5, HERE << &e << ' ' << e.swap_dirn << ' ' << e.swap_filen);
-    if (repl->Referenced)
+    if (repl && repl->Referenced)
         repl->Referenced(repl, &e, &e.repl);
 }
 
@@ -592,7 +586,7 @@ void
 Rock::SwapDir::dereference(StoreEntry &e)
 {
     debugs(47, 5, HERE << &e << ' ' << e.swap_dirn << ' ' << e.swap_filen);
-    if (repl->Dereferenced)
+    if (repl && repl->Dereferenced)
         repl->Dereferenced(repl, &e, &e.repl);
 }
 
@@ -609,7 +603,8 @@ void
 Rock::SwapDir::trackReferences(StoreEntry &e)
 {
     debugs(47, 5, HERE << e);
-    repl->Add(repl, &e, &e.repl);
+    if (repl)
+        repl->Add(repl, &e, &e.repl);
 }
 
 
@@ -617,7 +612,8 @@ void
 Rock::SwapDir::ignoreReferences(StoreEntry &e)
 {
     debugs(47, 5, HERE << e);
-    repl->Remove(repl, &e, &e.repl);
+    if (repl)
+        repl->Remove(repl, &e, &e.repl);
 }
 
 void