---------------------
PatchSet 3971 
Date: 2002/04/09 19:04:41
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Changes needed by AWIN32 Async I/O

Members: 
	port/win32/squid.dsw:1.1.2.7->1.1.2.8 
	port/win32/include/autoconf.h:1.1.2.5->1.1.2.6 
	src/fd.c:1.7.16.4->1.7.16.5 
	src/fs/awin32/store_asyncufs.h:1.1.62.2->1.1.62.3 

Index: squid/port/win32/squid.dsw
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid.dsw,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- squid/port/win32/squid.dsw	8 Apr 2002 19:18:38 -0000	1.1.2.7
+++ squid/port/win32/squid.dsw	9 Apr 2002 19:04:41 -0000	1.1.2.8
@@ -335,6 +335,9 @@
     Begin Project Dependency
     Project_Dep_Name pinger
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name dnsserver
+    End Project Dependency
 }}}
 
 ###############################################################################
Index: squid/port/win32/include/autoconf.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- squid/port/win32/include/autoconf.h	7 Apr 2002 13:10:24 -0000	1.1.2.5
+++ squid/port/win32/include/autoconf.h	9 Apr 2002 19:04:42 -0000	1.1.2.6
@@ -22,7 +22,7 @@
  *
  */
 
-/* $Id: autoconf.h,v 1.1.2.5 2002/04/07 13:10:24 serassio Exp $ */
+/* $Id: autoconf.h,v 1.1.2.6 2002/04/09 19:04:42 serassio Exp $ */
 
 /*
  * configure command line used to configure Squid
@@ -70,7 +70,7 @@
 
 /* Defines how many threads aufs uses for I/O */
 #undef AUFS_IO_THREADS 
-#define AUFS_IO_THREADS 16
+#define AUFS_IO_THREADS 20
 
 /*
  * If you want to use Squid's ICMP features (highly recommended!) then
Index: squid/src/fd.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fd.c,v
retrieving revision 1.7.16.4
retrieving revision 1.7.16.5
diff -u -r1.7.16.4 -r1.7.16.5
--- squid/src/fd.c	8 Apr 2002 17:06:10 -0000	1.7.16.4
+++ squid/src/fd.c	9 Apr 2002 19:04:42 -0000	1.7.16.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fd.c,v 1.7.16.4 2002/04/08 17:06:10 serassio Exp $
+ * $Id: fd.c,v 1.7.16.5 2002/04/09 19:04:42 serassio Exp $
  *
  * DEBUG: section 51    Filedescriptor Functions
  * AUTHOR: Duane Wessels
@@ -109,7 +109,12 @@
 int
 file_read_method(int fd, char *buf, int len)
 {
-    return (fread(buf, 1, len, fd_table[fd].fbuf));
+    FILE *fbuf = fd_table[fd].fbuf;
+
+    if (fbuf == NULL)
+	return (read(fd, buf, len));
+    else
+	return (fread(buf, 1, len, fbuf));
 }
 
 int
@@ -120,7 +125,12 @@
 
 file_write_method(int fd, const char *buf, int len)
 {
-    return (fwrite(buf, 1, len, fd_table[fd].fbuf));
+    FILE *fbuf = fd_table[fd].fbuf;
+
+    if (fbuf == NULL)
+	return (write(fd, buf, len));
+    else
+	return (fwrite(buf, 1, len, fbuf));
 }
 #endif
 
Index: squid/src/fs/awin32/store_asyncufs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/awin32/Attic/store_asyncufs.h,v
retrieving revision 1.1.62.2
retrieving revision 1.1.62.3
diff -u -r1.1.62.2 -r1.1.62.3
--- squid/src/fs/awin32/store_asyncufs.h	7 Apr 2002 13:10:25 -0000	1.1.62.2
+++ squid/src/fs/awin32/store_asyncufs.h	9 Apr 2002 19:04:43 -0000	1.1.62.3
@@ -20,9 +20,9 @@
 
 /* Which operations to run async */
 #define ASYNC_OPEN 1
-#define ASYNC_CLOSE 1
+#define ASYNC_CLOSE 0
 #define ASYNC_CREATE 1
-#define ASYNC_WRITE 1
+#define ASYNC_WRITE 0
 #define ASYNC_READ 1
 
 struct _squidaio_result_t {