From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 11 Sep 2011 22:02:56 +0000 (-0600)
Subject: Polished cache_mem description by adding some shared memory cache specifics.
X-Git-Tag: take08~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29f35ca590026fdba3d92bb0b77ef306d3e4b776;p=thirdparty%2Fsquid.git

Polished cache_mem description by adding some shared memory cache specifics.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 2b3f195aea..a7247a0513 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2560,6 +2560,11 @@ DOC_START
 	decreases, blocks will be freed until the high-water mark is
 	reached.  Thereafter, blocks will be used to store hot
 	objects.
+
+	If shared memory caching is enabled, Squid does not use the shared
+	cache space for in-transit objects, but they still consume as much
+	local memory as they need. For more details about the shared memory
+	cache, see memory_cache_shared.
 DOC_END
 
 NAME: maximum_object_size_in_memory
diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc
index 085abd7a7e..deecbf9079 100644
--- a/src/ipc/mem/Pages.cc
+++ b/src/ipc/mem/Pages.cc
@@ -62,10 +62,6 @@ Ipc::Mem::PageLimit(const int purpose)
 {
     switch (purpose) {
     case PageId::cachePage:
-        // TODO: adjust cache_mem description to say that in SMP mode,
-        // in-transit objects are not allocated using cache_mem. Eventually,
-        // they should not use cache_mem even if shared memory is not used:
-        // in-transit objects have nothing to do with caching.
         return Config.memMaxSize > 0 ? Config.memMaxSize / PageSize() : 0;
     case PageId::ioPage:
         // XXX: this should be independent from memory cache pages