MFH: Better fix for #44607. Fixes #47487 (php_stream_fill_read_buffer()

performance degraded after fix of bug 44607).

diff --git a/NEWS b/NEWS
index 80f6254021e5cc4201790e62545eed616ecdc29f..c26edbb701d496464860d75b7467a123b91f3f43 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ PHP                                                                        NEWS
 - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
 - Fixed bug #47546 (Default value for limit parameter in explode is 0, not -1).
   (Kalle)
+- Fixed bug #47487 (performance degraded when reading large chunks after fix of
+  bug #44607). (Arnaud)
 - Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6
   addresses in the filter extension). (Ilia)
 - Fixed bug #47430 (Errors after writing to nodeValue parameter of an absent 

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 4d1f7d5569cb279980ab8d9825a877993306e13d..64d0961cb5711913cb9a3f24da269cc826e4d50c 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -531,16 +531,16 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
                efree(chunk_buf);
 
        } else {
-               /* reduce buffer memory consumption if possible, to avoid a realloc */
-               if (stream->readbuf && stream->readbuflen - stream->writepos < stream->chunk_size) {
-                       memmove(stream->readbuf, stream->readbuf + stream->readpos, stream->readbuflen - stream->readpos);
-                       stream->writepos -= stream->readpos;
-                       stream->readpos = 0;
-               }
                /* is there enough data in the buffer ? */
-               while (stream->writepos - stream->readpos < (off_t)size) {
+               if (stream->writepos - stream->readpos < (off_t)size) {
                        size_t justread = 0;
-                       size_t toread;
+
+                       /* reduce buffer memory consumption if possible, to avoid a realloc */
+                       if (stream->readbuf && stream->readbuflen - stream->writepos < stream->chunk_size) {
+                               memmove(stream->readbuf, stream->readbuf + stream->readpos, stream->readbuflen - stream->readpos);
+                               stream->writepos -= stream->readpos;
+                               stream->readpos = 0;
+                       }
 
                        /* grow the buffer if required
                         * TODO: this can fail for persistent streams */
@@ -550,17 +550,13 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
                                                stream->is_persistent);
                        }
 
-                       toread = stream->readbuflen - stream->writepos;
                        justread = stream->ops->read(stream, stream->readbuf + stream->writepos,
-                                       toread
+                                       stream->readbuflen - stream->writepos
                                        TSRMLS_CC);
 
                        if (justread != (size_t)-1) {
                                stream->writepos += justread;
                        }
-                       if (stream->eof || justread != toread) {
-                               break;
-                       }
                }
        }
 }
@@ -859,10 +855,25 @@ PHPAPI char *_php_stream_get_line(php_stream *stream, char *buf, size_t maxlen,
 PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *returned_len, char *delim, size_t delim_len TSRMLS_DC)
 {
        char *e, *buf;
-       size_t toread;
+       size_t toread, len;
        int skip = 0;
 
-       php_stream_fill_read_buffer(stream, maxlen TSRMLS_CC);
+       len = stream->writepos - stream->readpos;
+
+       while (len < maxlen) {
+
+               size_t just_read;
+               toread = MIN(maxlen - len, stream->chunk_size);
+
+               php_stream_fill_read_buffer(stream, len + toread TSRMLS_CC);
+
+               just_read = (stream->writepos - stream->readpos) - len;
+               len += just_read;
+
+               if (just_read < toread) {
+                       break;
+               }
+       }
 
        if (delim_len == 0 || !delim) {
                toread = maxlen;