Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Avoid locking up the UI for gamecache loads.

Browse Source 
If the icon/bg is not loaded yet, we'd lock and block for it to load
anyway.  This uses a separate (or possibly atomic) lock.
This commit is contained in:
Unknown W. Brackets 2014-06-21 15:14:20 -07:00
parent a22fb9289d
commit f4f3d280f7
2 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
UI/GameInfoCache.cpp
View File

@ -293,12 +293,14 @@ public:
}
delete [] contents;
}
info_->iconDataLoaded = true;
}
if (info_->wantBG) {
if (pbp.GetSubFileSize(PBP_PIC1_PNG) > 0) {
lock_guard lock(info_->lock);
pbp.GetSubFileAsString(PBP_PIC1_PNG, &info_->pic1TextureData);
info_->pic1DataLoaded = true;
}
}
}
@ -319,6 +321,7 @@ handleELF:
if (contents) {
lock_guard lock(info_->lock);
info_->iconTextureData = std::string((const char *)contents, sz);
info_->iconDataLoaded = true;
}
delete [] contents;
}
@ -339,9 +342,12 @@ handleELF:
}
ReadFileToString(&umd, "/PSP_GAME/ICON0.PNG", &info_->iconTextureData, &info_->lock);
info_->iconDataLoaded = true;
if (info_->wantBG) {
ReadFileToString(&umd, "/PSP_GAME/PIC0.PNG", &info_->pic0TextureData, &info_->lock);
info_->pic0DataLoaded = true;
ReadFileToString(&umd, "/PSP_GAME/PIC1.PNG", &info_->pic1TextureData, &info_->lock);
info_->pic1DataLoaded = true;
}
break;
}
@ -367,7 +373,9 @@ handleELF:
if (info_->wantBG) {
ReadFileToString(&umd, "/PSP_GAME/PIC0.PNG", &info_->pic0TextureData, &info_->lock);
info_->pic0DataLoaded = true;
ReadFileToString(&umd, "/PSP_GAME/PIC1.PNG", &info_->pic1TextureData, &info_->lock);
info_->pic1DataLoaded = true;
}
}
@ -382,6 +390,7 @@ handleELF:
}
delete [] contents;
}
info_->iconDataLoaded = true;
break;
}
@ -395,6 +404,7 @@ handleELF:
if (contents) {
lock_guard lock(info_->lock);
info_->iconTextureData = std::string((const char *)contents, sz);
info_->iconDataLoaded = true;
}
delete [] contents;
}
@ -410,6 +420,7 @@ handleELF:
if (contents) {
lock_guard lock(info_->lock);
info_->iconTextureData = std::string((const char *)contents, sz);
info_->iconDataLoaded = true;
}
delete [] contents;
}
@ -455,8 +466,7 @@ void GameInfoCache::Shutdown() {
StopProcessingWorkQueue(gameInfoWQ_);
}
void GameInfoCache::Save()
{
void GameInfoCache::Save() {
// TODO
}
@ -532,9 +542,15 @@ GameInfo *GameInfoCache::GetInfo(const std::string &gamePath, bool wantBG) {
// Need to start over. We'll just add a new work item.
goto again;
}
SetupTexture(info, info->iconTextureData, info->iconTexture, info->timeIconWasLoaded);
SetupTexture(info, info->pic0TextureData, info->pic0Texture, info->timePic0WasLoaded);
SetupTexture(info, info->pic1TextureData, info->pic1Texture, info->timePic1WasLoaded);
if (info->iconDataLoaded) {
SetupTexture(info, info->iconTextureData, info->iconTexture, info->timeIconWasLoaded);
}
if (info->pic0DataLoaded) {
SetupTexture(info, info->pic0TextureData, info->pic0Texture, info->timePic0WasLoaded);
}
if (info->pic1DataLoaded) {
SetupTexture(info, info->pic1TextureData, info->pic1Texture, info->timePic1WasLoaded);
}
iter->second->lastAccessedTime = time_now_d();
return iter->second;
}
@ -557,7 +573,6 @@ again:
}
void GameInfoCache::SetupTexture(GameInfo *info, std::string &textureData, Texture *&tex, double &loadTime) {
lock_guard lock(info->lock);
if (textureData.size()) {
if (!tex) {
tex = new Texture();

44
UI/GameInfoCache.h
View File

@ -42,6 +42,46 @@ enum GameRegion {
GAMEREGION_MAX,
};
// TODO: Need to fix c++11 still on Symbian and use std::atomic<bool> instead.
class CompletionFlag {
public:
CompletionFlag() : pending(1) {
}
void SetDone() {
#if defined(_WIN32)
_WriteBarrier();
pending = 0;
#else
__sync_lock_release(&pending);
#endif
}
bool IsDone() {
const bool done = pending == 0;
#if defined(_WIN32)
_ReadBarrier();
#else
__sync_synchronize();
#endif
return done;
}
CompletionFlag &operator =(const bool &v) {
pending = v ? 0 : 1;
return *this;
}
operator bool() {
return IsDone();
}
private:
volatile u32 pending;
DISALLOW_COPY_AND_ASSIGN(CompletionFlag);
};
class GameInfo {
public:
GameInfo()
@ -98,6 +138,10 @@ public:
double timePic0WasLoaded;
double timePic1WasLoaded;
CompletionFlag iconDataLoaded;
CompletionFlag pic0DataLoaded;
CompletionFlag pic1DataLoaded;
u64 gameSize;
u64 saveDataSize;
u64 installDataSize;