From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 18 Mar 2014 10:05:32 +0000 (+0100)
Subject: Fix documentation for high_memory_warning config option and make it conditional
X-Git-Tag: SQUID_3_5_0_1~327^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bf2a4760f2aa08b737b1eeb044e4fd0443b44b1;p=thirdparty%2Fsquid.git

Fix documentation for high_memory_warning config option and make it conditional
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 194ee1696a..5db39b51d2 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -9006,13 +9006,15 @@ DOC_END
 NAME: high_memory_warning
 TYPE: b_size_t
 LOC: Config.warnings.high_memory
+IFDEF: HAVE_MSTATS && HAVE_GNUMALLOC_H
 DEFAULT: 0 KB
 DEFAULT_DOC: disabled.
 DOC_START
-	If the memory usage (as determined by mallinfo) exceeds
-	this amount, Squid prints a WARNING with debug level 0 to get
+	If the memory usage (as determined by gnumalloc, if available and used)
+	exceeds	this amount, Squid prints a WARNING with debug level 0 to get
 	the administrators attention.
 DOC_END
+# TODO: link high_memory_warning to mempools?
 
 NAME: sleep_after_fork
 COMMENT: (microseconds)