aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/squid.inc2
-rw-r--r--packages/squid_cache.xml8
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/squid.inc b/packages/squid.inc
index ac4ebf55..cd6198e6 100644
--- a/packages/squid.inc
+++ b/packages/squid.inc
@@ -356,7 +356,7 @@ function squid_resync_cache() {
$max_objsize = ($settings['maximum_object_size'] ? $settings['maximum_object_size'] : 4);
$min_objsize = ($settings['minimum_object_size'] ? $settings['minimum_object_size'] : 0);
$cache_policy = ($settings['cache_replacement_policy'] ? $settings['cache_replacement_policy'] : 'heap LFUDA');
- $memory_policy = ($settings['memory_replacement_policy'] ? $settings['memory_replacement_policy'] : 'heap GSDF');
+ $memory_policy = ($settings['memory_replacement_policy'] ? $settings['memory_replacement_policy'] : 'heap GDSF');
$offline_mode = ($settings['enable_offline'] == 'on' ? 'on' : 'off');
$conf = <<<EOD
diff --git a/packages/squid_cache.xml b/packages/squid_cache.xml
index 835d8c45..6e33d294 100644
--- a/packages/squid_cache.xml
+++ b/packages/squid_cache.xml
@@ -86,13 +86,13 @@
<field>
<fielddescr>Memory replacement policy</fielddescr>
<fieldname>memory_replacement</fieldname>
- <description>The memory replacement policy determines which objects are purged from memory when space is needed. The default policy for memory replacement is GSDF. &lt;p&gt; &lt;b&gt; LRU: Last Recently Used Policy &lt;/b&gt; - The LRU policies keep recently referenced objects. i.e., it replaces the object that has not been accessed for the longest time. &lt;p&gt; &lt;b&gt; Heap GSDF: Greedy-Dual Size Frequency &lt;/b&gt; - The Heap GSDF policy optimizes object-hit rate by keeping smaller, popular objects in cache. It achieves a lower byte hit rate than LFUDA though, since it evicts larger (possibly popular) objects. &lt;p&gt; &lt;b&gt; Heap LFUDA: Least Frequently Used with Dynamic Aging &lt;/b&gt; - The Heap LFUDA policy keeps popular objects in cache regardless of their size and thus optimizes byte hit rate at the expense of hit rate since one large, popular object will prevent many smaller, slightly less popular objects from being cached. &lt;p&gt; &lt;b&gt; Heap LRU: Last Recently Used &lt;/b&gt; - Works like LRU, but uses a heap instead. &lt;p&gt; Note: If using the LFUDA replacement policy, the value of Maximum Object Size should be increased above its default of 4096 KB to maximuze the potential byte hit rate improvement of LFUDA.</description>
- <default_value>heap GSDF</default_value>
+ <description>The memory replacement policy determines which objects are purged from memory when space is needed. The default policy for memory replacement is GDSF. &lt;p&gt; &lt;b&gt; LRU: Last Recently Used Policy &lt;/b&gt; - The LRU policies keep recently referenced objects. i.e., it replaces the object that has not been accessed for the longest time. &lt;p&gt; &lt;b&gt; Heap GDSF: Greedy-Dual Size Frequency &lt;/b&gt; - The Heap GDSF policy optimizes object-hit rate by keeping smaller, popular objects in cache. It achieves a lower byte hit rate than LFUDA though, since it evicts larger (possibly popular) objects. &lt;p&gt; &lt;b&gt; Heap LFUDA: Least Frequently Used with Dynamic Aging &lt;/b&gt; - The Heap LFUDA policy keeps popular objects in cache regardless of their size and thus optimizes byte hit rate at the expense of hit rate since one large, popular object will prevent many smaller, slightly less popular objects from being cached. &lt;p&gt; &lt;b&gt; Heap LRU: Last Recently Used &lt;/b&gt; - Works like LRU, but uses a heap instead. &lt;p&gt; Note: If using the LFUDA replacement policy, the value of Maximum Object Size should be increased above its default of 4096 KB to maximuze the potential byte hit rate improvement of LFUDA.</description>
+ <default_value>heap GDSF</default_value>
<type>select</type>
<options>
<option><name>LRU</name><value>lru</value></option>
<option><name>Heap LFUDA</name><value>heap LFUDA</value></option>
- <option><name>Heap GDSF</name><value>heap GSDF</value></option>
+ <option><name>Heap GDSF</name><value>heap GDSF</value></option>
<option><name>Heap LRU</name><value>heap LRU</value></option>
</options>
</field>
@@ -105,7 +105,7 @@
<options>
<option><name>LRU</name><value>lru</value></option>
<option><name>Heap LFUDA</name><value>heap LFUDA</value></option>
- <option><name>Heap GDSF</name><value>heap GSDF</value></option>
+ <option><name>Heap GDSF</name><value>heap GDSF</value></option>
<option><name>Heap LRU</name><value>heap LRU</value></option>
</options>
</field>