From c45b3e4e0e66ae56d06dcf1215477cf77eecc375 Mon Sep 17 00:00:00 2001 From: Yotam Barnoy Date: Sun, 22 Aug 2010 14:05:57 +0000 Subject: PSP: switched from stdio to psp functions in plugin branch Allows us to work with PSP plugins in this branch. Otherwise it's just too slow. svn-id: r52273 --- backends/fs/psp/psp-stream.cpp | 69 ++++++++++++++---------------------------- backends/fs/psp/psp-stream.h | 12 +++++--- 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/backends/fs/psp/psp-stream.cpp b/backends/fs/psp/psp-stream.cpp index 67c73beeaa..8843bfd2fb 100644 --- a/backends/fs/psp/psp-stream.cpp +++ b/backends/fs/psp/psp-stream.cpp @@ -24,16 +24,11 @@ */ #ifdef __PSP__ -#include #include -#include -#include #include "backends/platform/psp/powerman.h" #include "backends/fs/psp/psp-stream.h" -#include - #define MIN2(a,b) ((a < b) ? a : b) #define MIN3(a,b,c) ( (a < b) ? (a < c ? a : c) : (b < c ? b : c) ) @@ -65,7 +60,7 @@ void printBuffer(byte *ptr, uint32 len) { PSPIoStream::PSPIoStream(const Common::String &path, bool writeMode) - : StdioStream((void *)1), _path(path), _writeMode(writeMode), + : _handle(0), _path(path), _writeMode(writeMode), _ferror(false), _pos(0), _physicalPos(0), _fileSize(0), _inCache(false), _eos(false), _cacheStartOffset(-1), _cache(0), @@ -74,8 +69,6 @@ PSPIoStream::PSPIoStream(const Common::String &path, bool writeMode) DEBUG_ENTER_FUNC(); // assert(!path.empty()); // do we need this? - - _handle = (void *)0; // Need to do this since base class asserts not 0. } PSPIoStream::~PSPIoStream() { @@ -87,7 +80,7 @@ PSPIoStream::~PSPIoStream() { PowerMan.unregisterForSuspend(this); // Unregister with powermanager to be suspended // Must do this before fclose() or resume() will reopen. - fclose((FILE *)_handle); // We don't need a critical section. Worst case, the handle gets closed on its own + sceIoClose(_handle); // We don't need a critical section. Worst case, the handle gets closed on its own if (_cache) free(_cache); @@ -105,7 +98,7 @@ void *PSPIoStream::open() { PSP_DEBUG_PRINT_FUNC("Suspended\n"); } - _handle = fopen(_path.c_str(), _writeMode ? "wb" : "rb"); // open + _handle = sceIoOpen(_path.c_str(), _writeMode ? PSP_O_RDWR | PSP_O_CREAT : PSP_O_RDONLY, 0777); // open if (_handle) { // Get the file size. This way is much faster than going to the end of the file and back @@ -122,7 +115,7 @@ void *PSPIoStream::open() { PowerMan.endCriticalSection(); - return _handle; + return (void *)_handle; } bool PSPIoStream::err() const { @@ -188,7 +181,7 @@ bool PSPIoStream::seek(int32 offs, int whence) { } else { // not in cache _inCache = false; } - _pos = posToSearchFor; + _pos = posToSearchFor; return true; } @@ -245,11 +238,10 @@ uint32 PSPIoStream::read(void *ptr, uint32 len) { PSP_DEBUG_PRINT("filling cache with 0x%x bytes from physicalPos[0x%x]. cacheStart[0x%x], pos[0x%x], fileSize[0x%x]\n", lenToCopyToCache, _physicalPos, _cacheStartOffset, _pos, _fileSize); - size_t ret = fread(_cache, 1, lenToCopyToCache, (FILE *)_handle); - if (ret != lenToCopyToCache) { + int ret = sceIoRead(_handle, _cache, lenToCopyToCache); + if (ret != (int)lenToCopyToCache) { PSP_ERROR("in filling cache, failed to get 0x%x bytes. Only got 0x%x\n", lenToCopyToCache, ret); _ferror = true; - clearerr((FILE *)_handle); } _cacheStartOffset = _physicalPos; _inCache = true; @@ -264,15 +256,14 @@ uint32 PSPIoStream::read(void *ptr, uint32 len) { } else { // Too big for cache. No caching PSP_DEBUG_PRINT("reading 0x%x bytes from file to %p. Pos[0x%x], physPos[0x%x]\n", lenFromFile, destPtr, _pos, _physicalPos); - size_t ret = fread(destPtr, 1, lenFromFile, (FILE *)_handle); + int ret = sceIoRead(_handle, destPtr, lenFromFile); _physicalPos += ret; // Update pos _pos = _physicalPos; - if (ret != lenFromFile) { // error + if (ret != (int)lenFromFile) { // error PSP_ERROR("fread returned [0x%x] instead of len[0x%x]\n", ret, lenFromFile); _ferror = true; - clearerr((FILE *)_handle); _errorSource = 4; } _inCache = false; @@ -290,8 +281,10 @@ uint32 PSPIoStream::read(void *ptr, uint32 len) { // TODO: Test if seeking backwards/forwards has any effect on performance inline bool PSPIoStream::synchronizePhysicalPos() { if (_pos != _physicalPos) { - if (fseek((FILE *)_handle, _pos - _physicalPos, SEEK_CUR) != 0) + if (sceIoLseek32(_handle, _pos - _physicalPos, PSP_SEEK_CUR) < 0) { + _ferror = true; return false; + } _physicalPos = _pos; } @@ -314,26 +307,25 @@ uint32 PSPIoStream::write(const void *ptr, uint32 len) { PSP_DEBUG_PRINT_FUNC("filename[%s], len[0x%x]\n", _path.c_str(), len); - if (_ferror) + if (!len || _ferror) // we actually get calls with len=0 return 0; _eos = false; // we can't have eos with write synchronizePhysicalPos(); - size_t ret = fwrite(ptr, 1, len, (FILE *)_handle); + int ret = sceIoWrite(_handle, ptr, len); // If we're making the file bigger, adjust the size - if (_physicalPos + (int)ret > _fileSize) + if (_physicalPos + ret > _fileSize) _fileSize = _physicalPos + ret; + _physicalPos += ret; _pos = _physicalPos; _inCache = false; _cacheStartOffset = -1; // invalidate cache - if (ret != len) { // Set error + if (ret != (int)len) { // Set error _ferror = true; - clearerr((FILE *)_handle); - _pos = ftell((FILE *)_handle); // Update pos _errorSource = 5; PSP_ERROR("fwrite returned[0x%x] instead of len[0x%x]\n", ret, len); } @@ -344,23 +336,8 @@ uint32 PSPIoStream::write(const void *ptr, uint32 len) { } bool PSPIoStream::flush() { - DEBUG_ENTER_FUNC(); - // Enter critical section - if (PowerMan.beginCriticalSection()) - PSP_DEBUG_PRINT_FUNC("Suspended\n"); - int ret = fflush((FILE *)_handle); - - if (ret != 0) { - _ferror = true; - clearerr((FILE *)_handle); - _errorSource = 6; - PSP_ERROR("fflush returned ret[%d]\n", ret); - } - - PowerMan.endCriticalSection(); - - return (ret == 0); + return true; } // For the PSP, since we're building in suspend support, we moved opening @@ -393,8 +370,8 @@ int PSPIoStream::suspend() { } if (_handle > 0) { - fclose((FILE *)_handle); // close our file descriptor - _handle = (void *)0xFFFFFFFF; // Set handle to non-null invalid value so makeFromPath doesn't return error + sceIoClose(_handle); // close our file descriptor + _handle = 0xFFFFFFFF; // Set handle to non-null invalid value so makeFromPath doesn't return error } return 0; @@ -409,19 +386,19 @@ int PSPIoStream::resume() { _suspendCount--; // We reopen our file descriptor - _handle = fopen(_path.c_str(), _writeMode ? "wb" : "rb"); + _handle = sceIoOpen(_path.c_str(), _writeMode ? PSP_O_RDWR | PSP_O_CREAT : PSP_O_RDONLY, 0777); // open if (_handle <= 0) { PSP_ERROR("Couldn't reopen file %s\n", _path.c_str()); } // Resume our previous position if (_handle > 0 && _pos > 0) { - ret = fseek((FILE *)_handle, _pos, SEEK_SET); + ret = sceIoLseek32(_handle, _pos, PSP_SEEK_SET); _physicalPos = _pos; _inCache = false; - if (ret != 0) { // Check for problem + if (ret < 0) { // Check for problem _errorSuspend = ResumeError; _errorPos = _pos; _errorHandle = _handle; diff --git a/backends/fs/psp/psp-stream.h b/backends/fs/psp/psp-stream.h index 9fd1ad0470..ca9d40c720 100644 --- a/backends/fs/psp/psp-stream.h +++ b/backends/fs/psp/psp-stream.h @@ -26,15 +26,19 @@ #ifndef PSPSTREAM_H_ #define PSPSTREAM_H_ -#include "backends/fs/stdiostream.h" +#include #include "backends/platform/psp/powerman.h" -#include "common/list.h" +//#include "common/list.h" +#include "common/noncopyable.h" +#include "common/stream.h" +#include "common/str.h" /* * Class to handle special suspend/resume needs of PSP IO Streams */ -class PSPIoStream : public StdioStream, public Suspendable { +class PSPIoStream : public Common::SeekableReadStream, public Common::WriteStream, public Common::NonCopyable, public Suspendable { protected: + SceUID _handle; // file handle Common::String _path; int _fileSize; bool _writeMode; // for resuming in the right mode @@ -61,7 +65,7 @@ protected: int _errorSuspend; // for debugging mutable int _errorSource; int _errorPos; - void * _errorHandle; + SceUID _errorHandle; int _suspendCount; bool synchronizePhysicalPos(); // synchronize the physical and virtual positions -- cgit v1.2.3