---------------------
PatchSet 811 
Date: 2000/11/09 20:20:15
Author: hno
Branch: hno-2_2-async
Tag: (none) 
Log:
Moved magic defines back to squid.h. Needed in comm_select

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

Index: squid/src/aiops.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/aiops.c,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/aiops.c	9 Nov 2000 20:18:41 -0000	1.1.1.2.2.1.2.5
+++ squid/src/aiops.c	9 Nov 2000 20:20:15 -0000	1.1.1.2.2.1.2.6
@@ -1,5 +1,5 @@
 /*
- * $Id: aiops.c,v 1.1.1.2.2.1.2.5 2000/11/09 20:18:41 hno Exp $
+ * $Id: aiops.c,v 1.1.1.2.2.1.2.6 2000/11/09 20:20:15 hno Exp $
  *
  * DEBUG: section 43    AIOPS
  * AUTHOR: Stewart Forster <slf@connect.com.au>
@@ -813,15 +813,6 @@
     return request_queue_len + (done_requests.head ? 1 : 0);
 }
 
-/* Where we start to defer new disk operations (swapout) (!agressive) */
-#define MAGIC1 (NUMTHREADS/2)
-#define MAGIC1TIME 2
-/* Where we defer all new disk operations (swapin) */
-#define MAGIC2 (MAGIC1*2)
-#define MAGIC2TIME 1
-/* Where we absolutely defer all new disk operations */
-#define MAGIC3 (MAGIC2*2)
-
 int
 aio_overloaded(int agressive)
 {
Index: squid/src/squid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/squid.h,v
retrieving revision 1.1.1.2.2.1.2.3
retrieving revision 1.1.1.2.2.1.2.4
diff -u -r1.1.1.2.2.1.2.3 -r1.1.1.2.2.1.2.4
--- squid/src/squid.h	9 Nov 2000 20:13:12 -0000	1.1.1.2.2.1.2.3
+++ squid/src/squid.h	9 Nov 2000 20:20:15 -0000	1.1.1.2.2.1.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.1.1.2.2.1.2.3 2000/11/09 20:13:12 hno Exp $
+ * $Id: squid.h,v 1.1.1.2.2.1.2.4 2000/11/09 20:20:15 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -401,3 +401,13 @@
 #else
 #define NUMTHREADS (Config.cacheSwap.n_configured*8)
 #endif
+
+/* Where we start to defer new disk operations (swapout) (!agressive) */
+#define MAGIC1 (NUMTHREADS/2)
+#define MAGIC1TIME 2
+/* Where we defer all new disk operations (swapin) */
+#define MAGIC2 (MAGIC1*2)
+#define MAGIC2TIME 1
+/* Where we absolutely defer all new disk operations */
+#define MAGIC3 (MAGIC2*2)
+