cvs: php-src /main/streams streams.c

lbarnaud Thu Mar 19 17:54:28 2009 UTC Modified files: /php-src/main/streams streams.c Log: Better fix for #44607. Fixes #47487 (php_stream_fill_read_buffer() performance degraded after fix of bug 44607). http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.179&r2=1.180&diff_format=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.179 php-src/main/streams/streams.c:1.180 --- php-src/main/streams/streams.c:1.179 Tue Mar 10 23:40:01 2009 +++ php-src/main/streams/streams.c Thu Mar 19 17:54:28 2009 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.179 2009/03/10 23:40:01 helly Exp $ */ +/* $Id: streams.c,v 1.180 2009/03/19 17:54:28 lbarnaud Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -551,16 +551,16 @@ efree(chunk_buf); } else { /* Unfiltered Binary stream */ - /* reduce buffer memory consumption if possible, to avoid a realloc */ - if (stream->readbuf.s && stream->readbuflen - stream->writepos < stream->chunk_size) { - memmove(stream->readbuf.s, stream->readbuf.s + stream->readpos, stream->writepos - 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.s && stream->readbuflen - stream->writepos < stream->chunk_size) { + memmove(stream->readbuf.s, stream->readbuf.s + stream->readpos, stream->writepos - stream->readpos); + stream->writepos -= stream->readpos; + stream->readpos = 0; + } /* grow the buffer if required * TODO: this can fail for persistent streams */ @@ -569,15 +569,10 @@ stream->readbuf.s = (char*)perealloc(stream->readbuf.s, stream->readbuflen, stream->is_persistent); } - toread = stream->readbuflen - stream->writepos; - justread = stream->ops->read(stream, stream->readbuf.s + stream->writepos, toread TSRMLS_CC); - - if (justread != (size_t)-1) { + justread = stream->ops->read(stream, stream->readbuf.s + stream->writepos, stream->readbuflen - stream->writepos TSRMLS_CC); + if (justread != (size_t)-1 && justread != 0) { stream->writepos += justread; } - if (stream->eof || justread != toread) { - break; - } } } } @@ -1114,10 +1109,25 @@ 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;