---------------------
PatchSet 12011 
Date: 2008/03/18 03:11:27
Author: hno
Branch: SQUID_2_7
Tag: (none) 
Log:
Remove obsolete advanced comm tuning knobs which no longer have an effect

The generalization of the comm framework in 2.6 to support epoll/kqueue
lost some of the excotic knobs for tuning incoming rates.

Members: 
	src/cf.data.pre:1.450.2.10->1.450.2.11 
	src/structs.h:1.538.2.5->1.538.2.6 

Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid/squid/src/cf.data.pre,v
retrieving revision 1.450.2.10
retrieving revision 1.450.2.11
diff -u -r1.450.2.10 -r1.450.2.11
--- squid/src/cf.data.pre	18 Mar 2008 02:49:30 -0000	1.450.2.10
+++ squid/src/cf.data.pre	18 Mar 2008 03:11:27 -0000	1.450.2.11
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.450.2.10 2008/03/18 02:49:30 hno Exp $
+# $Id: cf.data.pre,v 1.450.2.11 2008/03/18 03:11:27 hno Exp $
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -1273,17 +1273,6 @@
 	to off when using this directive in such configurations.
 DOC_END
 
-NAME: incoming_rate
-TYPE: int
-DEFAULT: 30
-LOC: Config.incoming_rate
-DOC_START
-	This directive controls how aggressive Squid should accept new
-	connections compared to processing existing connections. 
-	The lower number the more frequent Squid will look for new
-	incoming requests.
-DOC_END
-
 COMMENT_START
  SSL OPTIONS
  -----------------------------------------------------------------------------
@@ -4950,46 +4939,6 @@
  -----------------------------------------------------------------------------
 COMMENT_END
 
-NAME: incoming_icp_average
-TYPE: int
-DEFAULT: 6
-LOC: Config.comm_incoming.icp_average
-DOC_NONE
-
-NAME: incoming_http_average
-TYPE: int
-DEFAULT: 4
-LOC: Config.comm_incoming.http_average
-DOC_NONE
-
-NAME: incoming_dns_average
-TYPE: int
-DEFAULT: 4
-LOC: Config.comm_incoming.dns_average
-DOC_NONE
-
-NAME: min_icp_poll_cnt
-TYPE: int
-DEFAULT: 8
-LOC: Config.comm_incoming.icp_min_poll
-DOC_NONE
-
-NAME: min_dns_poll_cnt
-TYPE: int
-DEFAULT: 8
-LOC: Config.comm_incoming.dns_min_poll
-DOC_NONE
-
-NAME: min_http_poll_cnt
-TYPE: int
-DEFAULT: 8
-LOC: Config.comm_incoming.http_min_poll
-DOC_START
-	Heavy voodoo here.  I can't even believe you are reading this.
-	Are you crazy?  Don't even think about adjusting these unless
-	you understand the algorithms in comm_select.c first!
-DOC_END
-
 NAME: max_filedescriptors max_filedesc
 TYPE: int
 DEFAULT: 0
@@ -5047,6 +4996,17 @@
 	the default buffer size.
 DOC_END
 
+NAME: incoming_rate
+TYPE: int
+DEFAULT: 30
+LOC: Config.incoming_rate
+DOC_START
+	This directive controls how aggressive Squid should accept new
+	connections compared to processing existing connections. 
+	The lower number the more frequent Squid will look for new
+	incoming requests.
+DOC_END
+
 COMMENT_START
  DNS OPTIONS
  -----------------------------------------------------------------------------
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid/squid/src/structs.h,v
retrieving revision 1.538.2.5
retrieving revision 1.538.2.6
diff -u -r1.538.2.5 -r1.538.2.6
--- squid/src/structs.h	18 Mar 2008 02:49:30 -0000	1.538.2.5
+++ squid/src/structs.h	18 Mar 2008 03:11:27 -0000	1.538.2.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.538.2.5 2008/03/18 02:49:30 hno Exp $
+ * $Id: structs.h,v 1.538.2.6 2008/03/18 03:11:27 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -765,14 +765,6 @@
 #if DELAY_POOLS
     delayConfig Delay;
 #endif
-    struct {
-	int icp_average;
-	int dns_average;
-	int http_average;
-	int icp_min_poll;
-	int dns_min_poll;
-	int http_min_poll;
-    } comm_incoming;
     int max_open_disk_fds;
     int uri_whitespace;
     squid_off_t rangeOffsetLimit;