wez Tue Mar 18 09:35:01 2003 EDT
Modified files:
/php4/main/streams streams.c
Log:
Fix for #22721 (poor file() performance on systems without mmap)
Index: php4/main/streams/streams.c
diff -u php4/main/streams/streams.c:1.10 php4/main/streams/streams.c:1.11
--- php4/main/streams/streams.c:1.10 Mon Mar 17 17:25:55 2003
+++ php4/main/streams/streams.c Tue Mar 18 09:35:01 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.10 2003/03/17 22:25:55 iliaa Exp $ */
+/* $Id: streams.c,v 1.11 2003/03/18 14:35:01 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1100,6 +1100,7 @@
size_t len = 0, max_len;
int step = CHUNK_SIZE;
int min_room = CHUNK_SIZE / 4;
+ php_stream_statbuf ssbuf;
if (buf)
*buf = NULL;
@@ -1129,9 +1130,20 @@
return mapped;
}
}
+
+ /* avoid many reallocs by allocating a good sized chunk to begin with, if we
can.
+ * Note that the stream may be filtered, in which case the stat result may be
inaccurate,
+ * as the filter may inflate or deflate the number of bytes that we can read.
+ * In order to avoid an upsize followed by a downsize of the buffer,
overestimate by the
+ * step size (which is 2K).
+ * */
+ if (php_stream_stat(src, &ssbuf) == 0 && ssbuf.sb.st_size > 0) {
+ max_len = ssbuf.sb.st_size + step;
+ } else {
+ max_len = step;
+ }
- ptr = *buf = pemalloc_rel_orig(step, persistent);
- max_len = step;
+ ptr = *buf = pemalloc_rel_orig(max_len, persistent);
while((ret = php_stream_read(src, ptr, max_len - len))) {
len += ret;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
