fread: improve performance for unbuffered reads
We can use the buffer passed to fread(3) directly in the FILE *. The buffer needs to be reset before each call to __srefill(). This preserves the expected behavior in all cases. The change was found originally in OpenBSD and later adopted by NetBSD. MFC after: 2 weeks Obtained from: OpenBSD (CVS 1.18) Differential Revision: https://reviews.freebsd.org/D30548
This commit is contained in:
parent
0f86492b09
commit
a45843c8ed
@ -99,6 +99,35 @@ __fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
|
|||||||
fp->_r = 0;
|
fp->_r = 0;
|
||||||
total = resid;
|
total = resid;
|
||||||
p = buf;
|
p = buf;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If we're unbuffered we know that the buffer in fp is empty so
|
||||||
|
* we can read directly into buf. This is much faster than a
|
||||||
|
* series of one byte reads into fp->_nbuf.
|
||||||
|
*/
|
||||||
|
if ((fp->_flags & __SNBF) != 0 && buf != NULL) {
|
||||||
|
while (resid > 0) {
|
||||||
|
/* set up the buffer */
|
||||||
|
fp->_bf._base = fp->_p = p;
|
||||||
|
fp->_bf._size = resid;
|
||||||
|
|
||||||
|
if (__srefill(fp)) {
|
||||||
|
/* no more input: return partial result */
|
||||||
|
count = (total - resid) / size;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
p += fp->_r;
|
||||||
|
resid -= fp->_r;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* restore the old buffer (see __smakebuf) */
|
||||||
|
fp->_bf._base = fp->_p = fp->_nbuf;
|
||||||
|
fp->_bf._size = 1;
|
||||||
|
fp->_r = 0;
|
||||||
|
|
||||||
|
return (count);
|
||||||
|
}
|
||||||
|
|
||||||
while (resid > (r = fp->_r)) {
|
while (resid > (r = fp->_r)) {
|
||||||
(void)memcpy((void *)p, (void *)fp->_p, (size_t)r);
|
(void)memcpy((void *)p, (void *)fp->_p, (size_t)r);
|
||||||
fp->_p += r;
|
fp->_p += r;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user