Re: Request for inclusion in 1.2.13/.14 or 1.3.0: Win32 file copy efficiency

[Bojan Smojver]

On Thu, 2008-04-24 at 13:08 +1000, Bojan Smojver wrote:

> Maybe we should have a private #define that takes max of
> APR_FILE_DEFAULT_BUFSIZE and BUFSIZ and then uses that instead of just
> BUFSIZ?

For instance...

-- 
Bojan

Index: include/arch/win32/apr_arch_file_io.h
===================================================================
--- include/arch/win32/apr_arch_file_io.h	(revision 651151)
+++ include/arch/win32/apr_arch_file_io.h	(working copy)
@@ -86,6 +86,12 @@
 /* For backwards-compat */
 #define APR_FILE_BUFSIZE APR_FILE_DEFAULT_BUFSIZE
 
+#if BUFSIZ > APR_FILE_DEFAULT_BUFSIZE
+#define APR_BUFSIZ BUFSIZ
+#else
+#define APR_BUFSIZ APR_FILE_DEFAULT_BUFSIZE
+#endif
+
 /* obscure ommissions from msvc's sys/stat.h */
 #ifdef _MSC_VER
 #define S_IFIFO        _S_IFIFO /* pipe */
Index: include/arch/os2/apr_arch_file_io.h
===================================================================
--- include/arch/os2/apr_arch_file_io.h	(revision 651151)
+++ include/arch/os2/apr_arch_file_io.h	(working copy)
@@ -34,6 +34,12 @@
 #define APR_FILE_DEFAULT_BUFSIZE 4096
 #define APR_FILE_BUFSIZE APR_FILE_DEFAULT_BUFSIZE
 
+#if BUFSIZ > APR_FILE_DEFAULT_BUFSIZE
+#define APR_BUFSIZ BUFSIZ
+#else
+#define APR_BUFSIZ APR_FILE_DEFAULT_BUFSIZE
+#endif
+
 struct apr_file_t {
     apr_pool_t *pool;
     HFILE filedes;
Index: include/arch/unix/apr_arch_file_io.h
===================================================================
--- include/arch/unix/apr_arch_file_io.h	(revision 651151)
+++ include/arch/unix/apr_arch_file_io.h	(working copy)
@@ -90,6 +90,12 @@
 /* For backwards-compat */
 #define APR_FILE_BUFSIZE  APR_FILE_DEFAULT_BUFSIZE
 
+#if BUFSIZ > APR_FILE_DEFAULT_BUFSIZE
+#define APR_BUFSIZ BUFSIZ
+#else
+#define APR_BUFSIZ APR_FILE_DEFAULT_BUFSIZE
+#endif
+
 struct apr_file_t {
     apr_pool_t *pool;
     int filedes;
Index: include/arch/netware/apr_arch_file_io.h
===================================================================
--- include/arch/netware/apr_arch_file_io.h	(revision 651151)
+++ include/arch/netware/apr_arch_file_io.h	(working copy)
@@ -73,6 +73,12 @@
 /* For backwards compat */
 #define APR_FILE_BUFSIZE APR_FILE_DEFAULT_BUFSIZE
 
+#if BUFSIZ > APR_FILE_DEFAULT_BUFSIZE
+#define APR_BUFSIZ BUFSIZ
+#else
+#define APR_BUFSIZ APR_FILE_DEFAULT_BUFSIZE
+#endif
+
 #if APR_HAS_THREADS
 #define file_lock(f)   do { \
                            if ((f)->thlock) \
Index: file_io/unix/copy.c
===================================================================
--- file_io/unix/copy.c	(revision 651151)
+++ file_io/unix/copy.c	(working copy)
@@ -54,7 +54,7 @@
 
     /* Copy bytes till the cows come home. */
     while (1) {
-        char buf[BUFSIZ];
+        char buf[APR_BUFSIZ];
         apr_size_t bytes_this_time = sizeof(buf);
         apr_status_t read_err;
         apr_status_t write_err;