Rename --disable-mempools to --enable-chunkedmempools to reflect it's function

diff --git a/configure.in b/configure.in
index dddaff4e1649bb59565cce9af96cc48cf5624572..7aa99daeaec13159a7993d6363602c9454264376 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1953,19 +1953,18 @@ AC_ARG_WITH(valgrind-debug,
 ])
 
 dnl Disable "memPools" code
-AC_ARG_ENABLE(mempools,
-  AS_HELP_STRING([--disable-mempools],
-                 [Disable memPools. Note that this option now simply sets the
-                  default behaviour. Specific classes can override this 
+AC_ARG_ENABLE(chunkedmempools,
+  AS_HELP_STRING([--enable-chunkedmempools],
+                 [Enable experimental chunked memPools. Note that this option
+                 simply sets the default behaviour. Specific classes can override this 
                   at runtime, and only lib/MemPool.c needs to be altered 
                   to change the squid-wide default for all classes.]), [ 
 SQUID_YESNO([$enableval],
-            [--disable-mempools option takes no arguments])
+            [--enable-chunkedmempools option takes no arguments])
 ])
-# notice: the definition's value meaning is INVERTED
-SQUID_DEFINE_BOOL(USE_MEMPOOLS,${enable_mempools:=no},
-   [Enable internal Memory Pools support (experimental)])
-AC_MSG_NOTICE([MemPools enabled: $enable_mempools])
+SQUID_DEFINE_BOOL(USE_CHUNKEDMEMPOOLS,${enable_chunkedmempools:=no},
+   [Enable chunked Memory Pools support (experimental)])
+AC_MSG_NOTICE([Chunked MemPools enabled: $enable_chunkedmempools])
 
 dnl Enable WIN32 Service compile mode
 AC_ARG_ENABLE(win32-service,

diff --git a/lib/MemPool.cc b/lib/MemPool.cc
index 8481278534983bfff017ce3f6ee70f521f426d8b..beaaf9bee9777176183091d1dc07d3bf1d79ef34 100644 (file)
--- a/lib/MemPool.cc
+++ b/lib/MemPool.cc
@@ -119,7 +119,7 @@ MemPools::idleLimit() const
  * MemPools::GetInstance().setDefaultPoolChunking() can be called.
  */
 MemPools::MemPools() : pools(NULL), mem_idle_limit(2 * MB),
-        poolCount (0), defaultIsChunked (USE_MEMPOOLS && !RUNNING_ON_VALGRIND)
+        poolCount (0), defaultIsChunked (USE_CHUNKEDMEMPOOLS && !RUNNING_ON_VALGRIND)
 {
     char *cfg = getenv("MEMPOOLS");
     if (cfg)