---------------------
PatchSet 2481 
Date: 2001/06/07 10:00:00
Author: hno
Branch: hno-2_2-mara
Tag: (none) 
Log:
Moved async-io defs to aiops.c

Members: 
	src/aiops.c:1.1.1.2.2.1.2.9->1.1.1.2.2.1.2.9.2.1 
	src/squid.h:1.1.1.2.2.1.2.6->1.1.1.2.2.1.2.6.2.1 

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.9
retrieving revision 1.1.1.2.2.1.2.9.2.1
diff -u -r1.1.1.2.2.1.2.9 -r1.1.1.2.2.1.2.9.2.1
--- squid/src/aiops.c	10 Nov 2000 10:36:47 -0000	1.1.1.2.2.1.2.9
+++ squid/src/aiops.c	7 Jun 2001 10:00:00 -0000	1.1.1.2.2.1.2.9.2.1
@@ -1,5 +1,5 @@
 /*
- * $Id: aiops.c,v 1.1.1.2.2.1.2.9 2000/11/10 10:36:47 hno Exp $
+ * $Id: aiops.c,v 1.1.1.2.2.1.2.9.2.1 2001/06/07 10:00:00 hno Exp $
  *
  * DEBUG: section 43    AIOPS
  * AUTHOR: Stewart Forster <slf@connect.com.au>
@@ -138,6 +138,20 @@
 static aio_thread_t *threads = NULL;
 static int aio_initialised = 0;
 
+#ifdef ASYNC_IO_THREADS
+#define NUMTHREADS ASYNC_IO_THREADS
+#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*4/3)
+#define MAGIC2TIME 1
+/* Where we absolutely defer all new disk operations with no time filter */
+#define MAGIC3 (MAGIC2*3/2)
 
 #define AIO_LARGE_BUFS  16384
 #define AIO_MEDIUM_BUFS	AIO_LARGE_BUFS >> 1
Index: squid/src/squid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/squid.h,v
retrieving revision 1.1.1.2.2.1.2.6
retrieving revision 1.1.1.2.2.1.2.6.2.1
diff -u -r1.1.1.2.2.1.2.6 -r1.1.1.2.2.1.2.6.2.1
--- squid/src/squid.h	10 Nov 2000 12:38:13 -0000	1.1.1.2.2.1.2.6
+++ squid/src/squid.h	7 Jun 2001 10:00:00 -0000	1.1.1.2.2.1.2.6.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.1.1.2.2.1.2.6 2000/11/10 12:38:13 hno Exp $
+ * $Id: squid.h,v 1.1.1.2.2.1.2.6.2.1 2001/06/07 10:00:00 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -395,19 +395,4 @@
 #define SQUID_NONBLOCK O_NDELAY
 #endif
 
-#endif /* SQUID_H */
-#ifdef ASYNC_IO_THREADS
-#define NUMTHREADS ASYNC_IO_THREADS
-#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*4/3)
-#define MAGIC2TIME 1
-/* Where we absolutely defer all new disk operations with no time filter */
-#define MAGIC3 (MAGIC2*3/2)
-
+#endif /* SQUID_H */