Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

GameInfoCache: Properly lock around accesses to the gameinfo map.

Browse source
This commit is contained in:
Henrik Rydgård 2024-01-29 00:08:03 +01:00
parent 0615ba3e54
commit 82f269cd48
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
UI/GameInfoCache.cpp
View file

@ -801,10 +801,12 @@ void GameInfoCache::Shutdown() {
void GameInfoCache::Clear() {
CancelAll();
std::lock_guard<std::mutex> lock(mapLock_);
info_.clear();
}
void GameInfoCache::CancelAll() {
std::lock_guard<std::mutex> lock(mapLock_);
for (auto info : info_) {
// GetFileLoader will create one if there isn't one already.
// Avoid that by checking.
@ -818,6 +820,7 @@ void GameInfoCache::CancelAll() {
}
void GameInfoCache::FlushBGs() {
std::lock_guard<std::mutex> lock(mapLock_);
for (auto iter = info_.begin(); iter != info_.end(); iter++) {
std::lock_guard<std::mutex> lock(iter->second->lock);
iter->second->pic0.Clear();
@ -831,19 +834,28 @@ void GameInfoCache::FlushBGs() {
}
void GameInfoCache::PurgeType(IdentifiedFileType fileType) {
for (auto iter = info_.begin(); iter != info_.end();) {
auto &info = iter->second;
bool retry = false;
// Trickery to avoid sleeping with the lock held.
do {
{
std::lock_guard<std::mutex> lock(mapLock_);
for (auto iter = info_.begin(); iter != info_.end();) {
auto &info = iter->second;
// TODO: Find a better way to wait here.
while (info->pendingFlags != (GameInfoFlags)0) {
sleep_ms(1);
// TODO: Find a better way to wait here.
while (info->pendingFlags != (GameInfoFlags)0) {
retry = true;
break;
}
if (info->fileType == fileType) {
iter = info_.erase(iter);
} else {
iter++;
}
}
}
if (info->fileType == fileType) {
iter = info_.erase(iter);
} else {
iter++;
}
}
sleep_ms(1);
} while (retry);
}
// Call on the main thread ONLY - that is from stuff called from NativeFrame.