From cdd2416ccc6c1d01ee61a8363bd418c359d9cc0c Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 27 Nov 2018 23:53:33 -0500 Subject: [PATCH] PHYSFS_flush() shouldn't call PHYSFS_Io::flush(). The former is meant to send PhysicsFS-buffered data to the PHYSFS_Io's implementation, the latter is meant to tell the OS to definitely make sure the data is safely written to disk (or at least, that's what it does in practice). This was making PHYSFS_setBuffer()'d handles _slower_, since they would end up blocking whenever the buffer was full until the data made the full trip to physical media, instead of just letting the OS do its own buffering. Now we still PHYSFS_Io::flush() on PHYSFS_close(), like this has always worked. That might also be overkill, but that remains a historical artifact of trying to keep the underlying file handle usable if pending writes fail for possibly-recoverable reasons (which isn't guaranteed if you just close() it, at least as far as I remember). (transplanted from 8b3cc36531c6ac09dbac98d3774921bdf14b240d) --- src/physfs.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/physfs.c b/src/physfs.c index ca76ce8..d0d5444 100644 --- a/src/physfs.c +++ b/src/physfs.c @@ -2669,7 +2669,6 @@ static int closeHandleInOpenList(FileHandle **list, FileHandle *handle) { FileHandle *prev = NULL; FileHandle *i; - int rc = 1; for (i = *list; i != NULL; i = i->next) { @@ -2677,9 +2676,16 @@ static int closeHandleInOpenList(FileHandle **list, FileHandle *handle) { PHYSFS_Io *io = handle->io; PHYSFS_uint8 *tmp = handle->buffer; - rc = PHYSFS_flush((PHYSFS_File *) handle); - if (!rc) + + /* send our buffer to io... */ + if (!PHYSFS_flush((PHYSFS_File *) handle)) return -1; + + /* ...then have io send it to the disk... */ + else if (io->flush && !io->flush(io)) + return -1; + + /* ...then close the underlying file. */ io->destroy(io); if (tmp != NULL) /* free any associated buffer. */ @@ -2977,7 +2983,7 @@ int PHYSFS_flush(PHYSFS_File *handle) rc = io->write(io, fh->buffer + fh->bufpos, fh->buffill - fh->bufpos); BAIL_IF_ERRPASS(rc <= 0, 0); fh->bufpos = fh->buffill = 0; - return io->flush ? io->flush(io) : 1; + return 1; } /* PHYSFS_flush */