dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sprite cache: List total candidates in cache eviction debug message

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-08-21 21:56:07 +01:00
parent d5e0d8f81e
commit d6f01988e3
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/spritecache.cpp
View File

@@ -816,20 +816,27 @@ static void DeleteEntriesFromSpriteCache(size_t target)
candidates.pop_back(); candidates.pop_back();
}; };
size_t total_candidates = 0;
SpriteID i = 0; SpriteID i = 0;
for (; i != _spritecache.size() && candidate_bytes < target; i++) { for (; i != _spritecache.size() && candidate_bytes < target; i++) {
SpriteCache *sc = GetSpriteCache(i); SpriteCache *sc = GetSpriteCache(i);
if (sc->GetType() != SpriteType::Recolour && sc->GetPtr() != nullptr) { if (sc->GetType() != SpriteType::Recolour && sc->GetPtr() != nullptr) {
push({ sc->lru, i, sc->buffer.GetSize() }); push({ sc->lru, i, sc->buffer.GetSize() });
total_candidates++;
if (candidate_bytes >= target) break; if (candidate_bytes >= target) break;
} }
} }
for (; i != _spritecache.size(); i++) { for (; i != _spritecache.size(); i++) {
SpriteCache *sc = GetSpriteCache(i); SpriteCache *sc = GetSpriteCache(i);
if (sc->GetType() != SpriteType::Recolour && sc->GetPtr() != nullptr && sc->lru <= candidates.front().lru) { if (sc->GetType() != SpriteType::Recolour && sc->GetPtr() != nullptr) {
push({ sc->lru, i, sc->buffer.GetSize() }); total_candidates++;
while (!candidates.empty() && candidate_bytes - candidates.front().size >= target) {
pop(); /* Only add to candidates if LRU <= current highest */
if (sc->lru <= candidates.front().lru) {
push({ sc->lru, i, sc->buffer.GetSize() });
while (!candidates.empty() && candidate_bytes - candidates.front().size >= target) {
pop();
}
} }
} }
} }
@@ -838,8 +845,8 @@ static void DeleteEntriesFromSpriteCache(size_t target)
DeleteEntryFromSpriteCache(it.id); DeleteEntryFromSpriteCache(it.id);
} }
DEBUG(sprite, 3, "DeleteEntriesFromSpriteCache, deleted: " PRINTF_SIZE ", freed: " PRINTF_SIZE ", in use: " PRINTF_SIZE " --> " PRINTF_SIZE ", delta: " PRINTF_SIZE ", requested: " PRINTF_SIZE, DEBUG(sprite, 3, "DeleteEntriesFromSpriteCache, deleted: " PRINTF_SIZE " of " PRINTF_SIZE ", freed: " PRINTF_SIZE ", in use: " PRINTF_SIZE " --> " PRINTF_SIZE ", delta: " PRINTF_SIZE ", requested: " PRINTF_SIZE,
candidates.size(), candidate_bytes, initial_in_use, GetSpriteCacheUsage(), initial_in_use - GetSpriteCacheUsage(), target); candidates.size(), total_candidates, candidate_bytes, initial_in_use, GetSpriteCacheUsage(), initial_in_use - GetSpriteCacheUsage(), target);
} }
void IncreaseSpriteLRU() void IncreaseSpriteLRU()