read_ahead_gap config directive by Jeffrey D. Wheelhouse. Allows

the read-ahead gap to be configured from squid.conf (previously
hardcoded at 16 KB)

diff --git a/src/cf.data.pre b/src/cf.data.pre
index f326c042e162fadedac573859ea2dc9a2c9de9c3..34ff79573864f17607f476f92a44bd548353181b 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.262 2002/06/18 10:54:17 hno Exp $
+# $Id: cf.data.pre,v 1.263 2002/06/21 12:58:20 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1639,6 +1639,15 @@ DOC_START
        cached then set 'quick_abort_min' to '-1 KB'.
 DOC_END
 
+NAME: read_ahead_gap
+COMMENT: buffer-size
+TYPE: kb_size_t
+LOC: Config.readAheadGap
+DEFAULT: 16 KB
+DOC_START
+       The amount of data the cache will buffer ahead of what has been
+       sent to the client when retrieving an object from another server.
+DOC_END
 
 NAME: negative_ttl
 COMMENT: time-units

diff --git a/src/defines.h b/src/defines.h
index aa55f54e376ff5f986083c80c4927a24c36f6f9c..64c80bf73eb4021bd1d0236236de9a2e59759e30 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: defines.h,v 1.103 2002/06/04 15:04:05 hno Exp $
+ * $Id: defines.h,v 1.104 2002/06/21 12:58:20 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -178,8 +178,6 @@
 #define ERROR_BUF_SZ (MAX_URL << 2)
 #endif
 
-#define READ_AHEAD_GAP         (1<<14)
-
 #if SQUID_SNMP
 #define VIEWINCLUDED    1
 #define VIEWEXCLUDED    2

diff --git a/src/forward.cc b/src/forward.cc
index 43e7a67485e94347d5789187c4380dedbbfa107c..2dfff334c396336f9d391001d652fd71b5c5553a 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.84 2002/04/13 23:07:50 hno Exp $
+ * $Id: forward.cc,v 1.85 2002/06/21 12:58:20 hno Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -644,7 +644,7 @@ fwdCheckDeferRead(int fd, void *data)
 #endif
     if (EBIT_TEST(e->flags, ENTRY_FWD_HDR_WAIT))
        return rc;
-    if (mem->inmem_hi - storeLowestMemReaderOffset(e) < READ_AHEAD_GAP)
+    if (mem->inmem_hi - storeLowestMemReaderOffset(e) < Config.readAheadGap)
        return rc;
     return 1;
 }

diff --git a/src/structs.h b/src/structs.h
index 3580d72909aab9b1f8422d1b85b7d7cca0aa4383..ff4638a3dd53956e9e06628d656e0f837dd4148c 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.419 2002/06/18 22:52:32 hno Exp $
+ * $Id: structs.h,v 1.420 2002/06/21 12:58:20 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -384,6 +384,7 @@ struct _SquidConfig {
        int pct;
        size_t max;
     } quickAbort;
+    size_t readAheadGap;
     RemovalPolicySettings *replPolicy;
     RemovalPolicySettings *memPolicy;
     time_t referenceAge;