CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-08 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

document setvbuf changes, only call it with bufsize >0

Browse Source
This commit is contained in:
Brad Parker 2017-11-17 16:12:36 -05:00
parent e6e27fe4cb
commit 94aa2cd08a
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro-common/include/streams/file_stream.h
View File

@ -56,7 +56,17 @@ void filestream_set_size(RFILE *stream);
const char *filestream_get_ext(RFILE *stream); const char *filestream_get_ext(RFILE *stream);
RFILE *filestream_open(const char *path, unsigned mode, ssize_t len); /**
* filestream_open:
* @path : path to file
* @mode : file mode to use when opening (read/write)
* @bufsize : optional buffer size (-1 or 0 to use default)
*
* Opens a file for reading or writing, depending on the requested mode.
* If bufsize is > 0 for unbuffered modes (like RFILE_MODE_WRITE), file will instead be fully buffered.
* Returns a pointer to an RFILE if opened successfully, otherwise NULL.
**/
RFILE *filestream_open(const char *path, unsigned mode, ssize_t bufsize);
ssize_t filestream_seek(RFILE *stream, ssize_t offset, int whence); ssize_t filestream_seek(RFILE *stream, ssize_t offset, int whence);

46
libretro-common/streams/file_stream.c
View File

@ -155,17 +155,17 @@ void filestream_set_size(RFILE *stream)
filestream_seek(stream, 0, SEEK_SET); filestream_seek(stream, 0, SEEK_SET);
} }
static void filestream_set_buffer(RFILE *stream, ssize_t len) /**
{ * filestream_open:
if (!stream || !stream->fp) * @path : path to file
return; * @mode : file mode to use when opening (read/write)
* @bufsize : optional buffer size (-1 or 0 to use default)
stream->buf = (char*)calloc(1, len); *
* Opens a file for reading or writing, depending on the requested mode.
setvbuf(stream->fp, stream->buf, _IOFBF, len); * If bufsize is > 0 for unbuffered modes (like RFILE_MODE_WRITE), file will instead be fully buffered.
} * Returns a pointer to an RFILE if opened successfully, otherwise NULL.
**/
RFILE *filestream_open(const char *path, unsigned mode, ssize_t len) RFILE *filestream_open(const char *path, unsigned mode, ssize_t bufsize)
{ {
int flags = 0; int flags = 0;
int mode_int = 0; int mode_int = 0;
@ -268,9 +268,6 @@ RFILE *filestream_open(const char *path, unsigned mode, ssize_t len)
if (stream->fd == -1) if (stream->fd == -1)
goto error; goto error;
if (len >= 0)
filestream_set_buffer(stream, len);
#else #else
#if defined(HAVE_BUFFERED_IO) #if defined(HAVE_BUFFERED_IO)
if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0 && mode_str) if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0 && mode_str)
@ -296,13 +293,24 @@ RFILE *filestream_open(const char *path, unsigned mode, ssize_t len)
if (!stream->fp) if (!stream->fp)
goto error; goto error;
if (len >= 0) if (bufsize > 0)
filestream_set_buffer(stream, len); {
/* Regarding setvbuf:
*
* https://www.freebsd.org/cgi/man.cgi?query=setvbuf&apropos=0&sektion=0&manpath=FreeBSD+11.1-RELEASE&arch=default&format=html
*
* If the size argument is not zero but buf is NULL, a buffer of the given size will be allocated immediately, and
* released on close. This is an extension to ANSI C.
*
* Since C89 does not support specifying a null buffer with a non-zero size, we create and track our own buffer for it.
*/
stream->buf = (char*)calloc(1, bufsize);
setvbuf(stream->fp, stream->buf, _IOFBF, bufsize);
}
} }
else else
#endif #endif
{ {
/* FIXME: HAVE_BUFFERED_IO is always 1, but if it is ever changed, open() needs to be changed to _wopen() for WIndows. */
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
#if defined(LEGACY_WIN32) #if defined(LEGACY_WIN32)
(void)path_wide; (void)path_wide;
@ -318,14 +326,12 @@ RFILE *filestream_open(const char *path, unsigned mode, ssize_t len)
free(path_wide); free(path_wide);
#endif #endif
#else #else
/* FIXME: HAVE_BUFFERED_IO is always 1, but if it is ever changed, this open() needs to have an alternate _wopen() for Windows. */
stream->fd = open(path, flags, mode_int); stream->fd = open(path, flags, mode_int);
#endif #endif
if (stream->fd == -1) if (stream->fd == -1)
goto error; goto error;
if (len >= 0)
filestream_set_buffer(stream, len);
#ifdef HAVE_MMAP #ifdef HAVE_MMAP
if (stream->hints & RFILE_HINT_MMAP) if (stream->hints & RFILE_HINT_MMAP)
{ {