Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-01-19 12:22:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Disable ISO RAM cache if out of memory.

Browse Source 
Better to fail to preload than to crash.
This commit is contained in:
Unknown W. Brackets 2015-12-19 15:29:34 -08:00
parent dd5c91108c
commit 95abf332d1
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Core/FileLoaders/RamCachingFileLoader.cpp
View File

@ -70,11 +70,17 @@ void RamCachingFileLoader::Seek(s64 absolutePos) {
}
size_t RamCachingFileLoader::ReadAt(s64 absolutePos, size_t bytes, void *data) {
size_t readSize = ReadFromCache(absolutePos, bytes, data);
// While in case the cache size is too small for the entire read.
while (readSize < bytes) {
SaveIntoCache(absolutePos + readSize, bytes - readSize);
readSize += ReadFromCache(absolutePos + readSize, bytes - readSize, (u8 *)data + readSize);
size_t readSize = 0;
if (cache_ == nullptr) {
lock_guard guard(backendMutex_);
readSize = backend_->ReadAt(absolutePos, bytes, data);
} else {
readSize = ReadFromCache(absolutePos, bytes, data);
// While in case the cache size is too small for the entire read.
while (readSize < bytes) {
SaveIntoCache(absolutePos + readSize, bytes - readSize);
readSize += ReadFromCache(absolutePos + readSize, bytes - readSize, (u8 *)data + readSize);
}
}
StartReadAhead(absolutePos + readSize);
@ -84,7 +90,10 @@ size_t RamCachingFileLoader::ReadAt(s64 absolutePos, size_t bytes, void *data) {
}
void RamCachingFileLoader::InitCache() {
cache_ = new u8[filesize_];
cache_ = (u8 *)malloc(filesize_);
if (cache_ == nullptr) {
return;
}
lock_guard guard(blocksMutex_);
u32 blockCount = (u32)((filesize_ + BLOCK_SIZE - 1) >> BLOCK_SHIFT);
@ -107,8 +116,10 @@ void RamCachingFileLoader::ShutdownCache() {
lock_guard guard(blocksMutex_);
blocks_.clear();
delete [] cache_;
cache_ = nullptr;
if (cache_ != nullptr) {
free(cache_);
cache_ = nullptr;
}
}
size_t RamCachingFileLoader::ReadFromCache(s64 pos, size_t bytes, void *data) {
@ -183,6 +194,10 @@ void RamCachingFileLoader::SaveIntoCache(s64 pos, size_t bytes) {
}
void RamCachingFileLoader::StartReadAhead(s64 pos) {
if (cache_ == nullptr) {
return;
}
lock_guard guard(blocksMutex_);
aheadPos_ = pos;
if (aheadThread_) {