Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 15:36:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rewrote fread/fwrite for a better/faster handling of reads/writes requests.

Browse source 
svn path=/trunk/; revision=3039
This commit is contained in:
Hartmut Birr 2002-06-10 21:26:36 +00:00
parent 9ac5422074
commit 495dfc660f
2 changed files with 128 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

72
reactos/lib/msvcrt/stdio/fread.c
View file

@ -7,8 +7,9 @@
size_t fread(void *vptr, size_t size, size_t count, FILE *iop) size_t fread(void *vptr, size_t size, size_t count, FILE *iop)
{ {
char *ptr = (char *)vptr; unsigned char *ptr = (unsigned char *)vptr;
size_t to_read ,n_read; size_t to_read ,n_read;
int c, copy;
to_read = size * count; to_read = size * count;
@ -29,25 +30,58 @@ size_t fread(void *vptr, size_t size, size_t count, FILE *iop)
if (vptr == NULL || to_read == 0) if (vptr == NULL || to_read == 0)
return 0; return 0;
while(iop->_cnt > 0 && to_read > 0 ) if (iop->_base == NULL)
{
int c = _filbuf(iop);
if (c == EOF)
return 0;
*ptr++ = c;
if (--to_read == 0)
return 1;
}
if (iop->_cnt > 0 && to_read > 0)
{
copy = min(iop->_cnt, to_read);
memcpy(ptr, iop->_ptr, copy);
ptr += copy;
iop->_ptr += copy;
iop->_cnt -= copy;
to_read -= copy;
if (to_read == 0)
return count;
}
if (to_read > 0)
{
if (to_read >= iop->_bufsiz)
{ {
to_read--; n_read = _read(fileno(iop), ptr, to_read);
*ptr++ = getc(iop); if (n_read < 0)
iop->_flag |= _IOERR;
else if (n_read == 0)
iop->_flag |= _IOEOF;
else
to_read -= n_read;
// the file buffer is empty and there is no read ahead information anymore.
iop->_flag &= ~_IOAHEAD;
} }
else
// if the buffer is dirty it will have to be written now {
// otherwise the file pointer won't match anymore. c = _filbuf(iop);
if (c != EOF)
fflush(iop); {
*ptr++ = c;
// check to see if this will work with in combination with ungetc to_read--;
copy = min(iop->_cnt, to_read);
n_read = _read(fileno(iop), ptr, to_read); memcpy(ptr, iop->_ptr, copy);
if ( n_read != -1 ) iop->_ptr += copy;
to_read -= n_read; iop->_cnt -= copy;
to_read -= copy;
// the file buffer is empty and there is no read ahead information anymore. }
iop->_flag &= ~_IOAHEAD; }
}
return count - (to_read/size); return count - (to_read/size);
} }

90
reactos/lib/msvcrt/stdio/fwrite.c
View file

@ -3,12 +3,17 @@
#include <msvcrt/string.h> #include <msvcrt/string.h>
#include <msvcrt/errno.h> #include <msvcrt/errno.h>
#include <msvcrt/internal/file.h> #include <msvcrt/internal/file.h>
#define NDEBUG
#include <msvcrt/msvcrtdbg.h>
size_t fwrite(const void *vptr, size_t size, size_t count, FILE *iop) size_t fwrite(const void *vptr, size_t size, size_t count, FILE *iop)
{ {
size_t to_write, n_written; size_t to_write, n_written;
char *ptr = (char *)vptr; unsigned char *ptr = (unsigned char *)vptr;
int copy;
DPRINT("fwrite(%x, %d, %d, %x)\n", vptr, size, count, iop);
to_write = size*count; to_write = size*count;
if (!OPEN4WRITING(iop)) if (!OPEN4WRITING(iop))
@ -28,24 +33,79 @@ size_t fwrite(const void *vptr, size_t size, size_t count, FILE *iop)
if (vptr == NULL || to_write == 0) if (vptr == NULL || to_write == 0)
return 0; return 0;
while(iop->_cnt > 0 && to_write > 0) if (iop->_base == NULL && !(iop->_flag&_IONBF))
{ {
to_write--; if (EOF == _flsbuf(*ptr++, iop))
putc(*ptr++,iop); return 0;
} if (--to_write == 0)
return 1;
}
// if the buffer is dirty it will have to be written now if (iop->_flag & _IOLBF)
// otherwise the file pointer won't match anymore. {
fflush(iop); while (to_write > 0)
{
if (EOF == putc(*ptr++, iop))
{
iop->_flag |= _IOERR;
break;
}
to_write--;
}
}
else
{
if (iop->_cnt > 0 && to_write > 0)
{
copy = min(iop->_cnt, to_write);
memcpy(iop->_ptr, ptr, copy);
ptr += copy;
iop->_ptr += copy;
iop->_cnt -= copy;
to_write -= copy;
iop->_flag |= _IODIRTY;
}
n_written = _write(fileno(iop), ptr,to_write); if (to_write > 0)
if (n_written != -1) {
to_write -= n_written; // if the buffer is dirty it will have to be written now
// otherwise the file pointer won't match anymore.
fflush(iop);
if (to_write >= iop->_bufsiz)
{
while (to_write > 0)
{
n_written = _write(fileno(iop), ptr, to_write);
if (n_written <= 0)
{
iop->_flag |= _IOERR;
break;
}
to_write -= n_written;
ptr += n_written;
}
// check to see if this will work with in combination with ungetc // check to see if this will work with in combination with ungetc
// the file buffer is empty and there is no read ahead information anymore. // the file buffer is empty and there is no read ahead information anymore.
iop->_flag &= ~_IOAHEAD; iop->_flag &= ~_IOAHEAD;
}
else
{
if (EOF != _flsbuf(*ptr++, iop))
{
if (--to_write > 0)
{
memcpy(iop->_ptr, ptr, to_write);
iop->_ptr += to_write;
iop->_cnt -= to_write;
iop->_flag |= _IODIRTY;
return count;
}
}
}
}
}
return count - (to_write/size); return count - (to_write/size);
} }