mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

(retro_file.c) Add USE_BUFFERED_IO

Browse Source
This commit is contained in:
twinaphex 2015-09-17 21:31:00 +02:00
parent a6458d6ab6
commit 714972bae9
1 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libretro-common/file/retro_file.c
View File

@ -38,10 +38,16 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#if 0
#define HAVE_BUFFERED_IO 1
#endif
struct RFILE struct RFILE
{ {
#if defined(PSP) || defined(VITA) #if defined(PSP) || defined(VITA)
SceUID fd; SceUID fd;
#elif defined(HAVE_BUFFERED_IO)
FILE *fd;
#else #else
int fd; int fd;
#endif #endif
@ -59,6 +65,8 @@ RFILE *retro_fopen(const char *path, unsigned mode, ssize_t len)
case RFILE_MODE_READ: case RFILE_MODE_READ:
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
stream->fd = sceIoOpen(path, O_RDONLY, 0777); stream->fd = sceIoOpen(path, O_RDONLY, 0777);
#elif defined(HAVE_BUFFERED_IO)
stream->fd = fopen(path, "rb");
#else #else
stream->fd = open(path, O_RDONLY); stream->fd = open(path, O_RDONLY);
#endif #endif
@ -66,6 +74,8 @@ RFILE *retro_fopen(const char *path, unsigned mode, ssize_t len)
case RFILE_MODE_WRITE: case RFILE_MODE_WRITE:
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
stream->fd = sceIoOpen(path, O_WRONLY | O_CREAT, 0777); stream->fd = sceIoOpen(path, O_WRONLY | O_CREAT, 0777);
#elif defined(HAVE_BUFFERED_IO)
stream->fd = fopen(path, "wb");
#else #else
stream->fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); stream->fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
#endif #endif
@ -73,6 +83,8 @@ RFILE *retro_fopen(const char *path, unsigned mode, ssize_t len)
case RFILE_MODE_READ_WRITE: case RFILE_MODE_READ_WRITE:
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
stream->fd = sceIoOpen(path, O_RDWR, 0777); stream->fd = sceIoOpen(path, O_RDWR, 0777);
#elif defined(HAVE_BUFFERED_IO)
stream->fd = fopen(path, "w+");
#else #else
#ifdef _WIN32 #ifdef _WIN32
stream->fd = open(path, O_RDWR | O_BINARY); stream->fd = open(path, O_RDWR | O_BINARY);
@ -83,7 +95,18 @@ RFILE *retro_fopen(const char *path, unsigned mode, ssize_t len)
break; break;
} }
#if defined(HAVE_BUFFERED_IO)
if (!stream->fd)
#else
if (stream->fd == -1)
#endif
goto error;
return stream; return stream;
error:
retro_fclose(stream);
return NULL;
} }
ssize_t retro_fseek(RFILE *stream, ssize_t offset, int whence) ssize_t retro_fseek(RFILE *stream, ssize_t offset, int whence)
@ -93,6 +116,8 @@ ssize_t retro_fseek(RFILE *stream, ssize_t offset, int whence)
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
return sceIoLseek(stream->fd, (SceOff)offset, whence); return sceIoLseek(stream->fd, (SceOff)offset, whence);
#elif defined(HAVE_BUFFERED_IO)
return fseek(stream->fd, (long)offset, whence);
#else #else
return lseek(stream->fd, offset, whence); return lseek(stream->fd, offset, whence);
#endif #endif
@ -104,6 +129,8 @@ ssize_t retro_fread(RFILE *stream, void *s, size_t len)
return -1; return -1;
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
return sceIoRead(stream->fd, s, len); return sceIoRead(stream->fd, s, len);
#elif defined(HAVE_BUFFERED_IO)
return fread(s, len, 1, stream->fd);
#else #else
return read(stream->fd, s, len); return read(stream->fd, s, len);
#endif #endif
@ -115,6 +142,8 @@ ssize_t retro_fwrite(RFILE *stream, const void *s, size_t len)
return -1; return -1;
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
return sceIoWrite(stream->fd, s, len); return sceIoWrite(stream->fd, s, len);
#elif defined(HAVE_BUFFERED_IO)
return fwrite(s, len, 1, stream->fd);
#else #else
return write(stream->fd, s, len); return write(stream->fd, s, len);
#endif #endif
@ -126,23 +155,35 @@ void retro_fclose(RFILE *stream)
return; return;
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
sceIoClose(stream->fd); if (stream->fd > 0)
sceIoClose(stream->fd);
#elif defined(HAVE_BUFFERED_IO)
if (stream->fd)
fclose(stream->fd);
#else #else
close(stream->fd); if (stream->fd > 0)
close(stream->fd);
#endif #endif
free(stream); free(stream);
} }
static bool retro_fread_iterate(RFILE *stream, char *s, size_t len, ssize_t *bytes_written)
{
*bytes_written = retro_fread(stream, s, len);
#if defined(HAVE_BUFFERED_IO)
return (*bytes_written < 0);
#else
return (*bytes_written < 0 && errno == EINTR);
#endif
}
bool retro_fmemcpy(const char *path, char *s, size_t len, ssize_t *bytes_written) bool retro_fmemcpy(const char *path, char *s, size_t len, ssize_t *bytes_written)
{ {
RFILE *stream = retro_fopen(path, RFILE_MODE_READ, -1); RFILE *stream = retro_fopen(path, RFILE_MODE_READ, -1);
if (!stream) if (!stream)
return false; return false;
do while(retro_fread_iterate(stream, s, len, bytes_written));
{
*bytes_written = retro_fread(stream, s, len);
}while(*bytes_written < 0 && errno == EINTR);
retro_fclose(stream); retro_fclose(stream);
if (*bytes_written < 0) if (*bytes_written < 0)