---------------------
PatchSet 818 
Date: 2000/11/10 12:38:13
Author: hno
Branch: hno-2_2-async
Tag: (none) 
Log:
Some more tuning to detect disk overload

Members: 
	src/comm_select.c:1.1.1.2.2.1.2.4->1.1.1.2.2.1.2.5 
	src/squid.h:1.1.1.2.2.1.2.5->1.1.1.2.2.1.2.6 

Index: squid/src/comm_select.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/comm_select.c,v
retrieving revision 1.1.1.2.2.1.2.4
retrieving revision 1.1.1.2.2.1.2.5
diff -u -r1.1.1.2.2.1.2.4 -r1.1.1.2.2.1.2.5
--- squid/src/comm_select.c	9 Nov 2000 20:18:41 -0000	1.1.1.2.2.1.2.4
+++ squid/src/comm_select.c	10 Nov 2000 12:38:13 -0000	1.1.1.2.2.1.2.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_select.c,v 1.1.1.2.2.1.2.4 2000/11/09 20:18:41 hno Exp $
+ * $Id: comm_select.c,v 1.1.1.2.2.1.2.5 2000/11/10 12:38:13 hno Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -128,7 +128,7 @@
 #define commCheckICPIncoming (++icp_io_events > (incoming_icp_interval>> INCOMING_FACTOR))
 #define commCheckHTTPIncoming (++http_io_events > (incoming_http_interval>> INCOMING_FACTOR))
 static int async_io_events = 0;
-#define commCheckAIO ((++async_io_events > MAGIC1 - 2) ? (async_io_events = 0, 1) : 0)
+#define commCheckAIO ((++async_io_events > MAGIC1 - 4) ? (async_io_events = 0, 1) : 0)
 
 static int
 commDeferRead(int fd)
Index: squid/src/squid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/squid.h,v
retrieving revision 1.1.1.2.2.1.2.5
retrieving revision 1.1.1.2.2.1.2.6
diff -u -r1.1.1.2.2.1.2.5 -r1.1.1.2.2.1.2.6
--- squid/src/squid.h	10 Nov 2000 10:36:47 -0000	1.1.1.2.2.1.2.5
+++ squid/src/squid.h	10 Nov 2000 12:38:13 -0000	1.1.1.2.2.1.2.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.1.1.2.2.1.2.5 2000/11/10 10:36:47 hno Exp $
+ * $Id: squid.h,v 1.1.1.2.2.1.2.6 2000/11/10 12:38:13 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -403,11 +403,11 @@
 #endif
 
 /* Where we start to defer new disk operations (swapout) (!agressive) */
-#define MAGIC1 (NUMTHREADS/3)
+#define MAGIC1 (NUMTHREADS/2)
 #define MAGIC1TIME 2
 /* Where we defer all new disk operations (swapin) */
-#define MAGIC2 (MAGIC1*2)
+#define MAGIC2 (MAGIC1*4/3)
 #define MAGIC2TIME 1
 /* Where we absolutely defer all new disk operations with no time filter */
-#define MAGIC3 (MAGIC2*2)
+#define MAGIC3 (MAGIC2*3/2)