From: rousskov <>
Date: Tue, 3 Mar 1998 23:21:26 +0000 (+0000)
Subject: - Config.mem_pools were used where Config.MemPools.limit should be. Fixed.
X-Git-Tag: SQUID_3_0_PRE1~3947
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f12c295b5b685d13fac4dd3990807f4e1196cd9c;p=thirdparty%2Fsquid.git

- Config.mem_pools were used where Config.MemPools.limit should be. Fixed.
- Adjusted "doc" section for mem_pools_limit to reflect current implementation.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 313fb2f8b5..ecd716f094 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1632,32 +1632,30 @@ NAME: memory_pools_limit
 COMMENT: (bytes)
 TYPE: b_size_t
 DEFAULT: none
-LOC: Config.onoff.mem_pools
+LOC: Config.MemPools.limit
 DOC_START
-	Used only with memory_pools on.
+	Used only with memory_pools on:
+	memory_pools_limit 50 MB
 
-	If set to a non-zero value, Squid will allocate at most the specified
-	limit for memory pools. All requests for memory that exceed this limit
-	will be handled by your malloc library. Squid does not allocate all
-	pools at once, but does it on-demand. Thus, it is safe to set
+	If set to a non-zero value, Squid will keep at most the specified
+	limit of allocated (but unused) memory in memory pools. All free()
+	requests that exceed this limit will be handled by your malloc
+	library. Squid does not pre-allocate any memory, just safe-keeps
+	objects that otherwise would be free()d. Thus, it is safe to set
 	memory_pools_limit to a reasonably high value even if your
-	configuration will use less memory. High value of memory_pools_limit
-	allows Squid to start allocation with larger memory chunks which is
-	more efficient.
-
-	If not set or set to zero, Squid will allocate memory for pools by
-	small chunks.  There will be no limit on the amount of memory it can
-	allocate.  No-limit mode is less efficient because Squid has more
-	memory chunks to maintain. However, this mode is useful when it is the
-	first time you run your configuration with mem_pools "on" and do not
-	want to guess the limit value.  Squid logs the actual amount of memory
-	used in cache log. Next time you run Squid, set memory_pools_limit
-	close to the value reported in the log.
+	configuration will use less memory.
+
+	If not set (default) or set to zero, Squid will keep all memory it
+	can. That is, there will be no limit on the total amount of memory
+	used for safe-keeping.
 
 	To disable memory allocation optimization, do not set
 	memory_pools_limit to 0. Set memory_pools to "off" instead.
 
-memory_pools_limit 50 MB
+	An overhead for maintaining memory pools is not taken into account
+	when the limit is checked. This overhead is close to four bytes per
+	object kept. However, pools may actually _save_ memory because of
+	reduced memory thrashing in your malloc library.
 DOC_END
 
 NAME: forwarded_for