ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GameFileCache: Pass std::function by reference rather than by value 

std::function is internally allowed to allocate, and these functions
aren't being stored anywhere (only called), so we can freely get rid
of some minor overhead here by passing by reference.

This change also creates aliases for the functions, so that there isn't
a lot of visual noise when reading the function signatures.
This commit is contained in:
Lioncash 2023-12-11 11:04:26 -05:00
parent d84ed054ee
commit 2ca80adeb2
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/UICommon/GameFileCache.cpp
View File

@ -43,7 +43,7 @@ GameFileCache::GameFileCache() : m_path(File::GetUserPath(D_CACHE_IDX) + "gameli
{ {
} }
void GameFileCache::ForEach(std::function<void(const std::shared_ptr<const GameFile>&)> f) const void GameFileCache::ForEach(const ForEachFn& f) const
{ {
for (const std::shared_ptr<GameFile>& item : m_cached_files) for (const std::shared_ptr<GameFile>& item : m_cached_files)
f(item); f(item);
@ -83,11 +83,10 @@ std::shared_ptr<const GameFile> GameFileCache::AddOrGet(const std::string& path,
return result; return result;
} }
bool GameFileCache::Update( bool GameFileCache::Update(const std::vector<std::string>& all_game_paths,
const std::vector<std::string>& all_game_paths, const GameAddedToCacheFn& game_added_to_cache,
std::function<void(const std::shared_ptr<const GameFile>&)> game_added_to_cache, const GameRemovedFromCacheFn& game_removed_from_cache,
std::function<void(const std::string&)> game_removed_from_cache, const std::atomic_bool& processing_halted)
const std::atomic_bool& processing_halted)
{ {
// Copy game paths into a set, except ones that match DiscIO::ShouldHideFromGameList. // Copy game paths into a set, except ones that match DiscIO::ShouldHideFromGameList.
// TODO: Prevent DoFileSearch from looking inside /files/ directories of DirectoryBlobs at all? // TODO: Prevent DoFileSearch from looking inside /files/ directories of DirectoryBlobs at all?
@ -151,9 +150,8 @@ bool GameFileCache::Update(
return cache_changed; return cache_changed;
} }
bool GameFileCache::UpdateAdditionalMetadata( bool GameFileCache::UpdateAdditionalMetadata(const GameUpdatedFn& game_updated,
std::function<void(const std::shared_ptr<const GameFile>&)> game_updated, const std::atomic_bool& processing_halted)
const std::atomic_bool& processing_halted)
{ {
bool cache_changed = false; bool cache_changed = false;

16
Source/Core/UICommon/GameFileCache.h
View File

@ -30,9 +30,14 @@ public:
Yes = 1, Yes = 1,
}; };
using ForEachFn = std::function<void(const std::shared_ptr<const GameFile>&)>;
using GameAddedToCacheFn = std::function<void(const std::shared_ptr<const GameFile>&)>;
using GameRemovedFromCacheFn = std::function<void(const std::string&)>;
using GameUpdatedFn = std::function<void(const std::shared_ptr<const GameFile>&)>;
GameFileCache(); GameFileCache();
void ForEach(std::function<void(const std::shared_ptr<const GameFile>&)> f) const; void ForEach(const ForEachFn& f) const;
size_t GetSize() const; size_t GetSize() const;
void Clear(DeleteOnDisk delete_on_disk); void Clear(DeleteOnDisk delete_on_disk);
@ -42,12 +47,11 @@ public:
// These functions return true if the call modified the cache. // These functions return true if the call modified the cache.
bool Update(const std::vector<std::string>& all_game_paths, bool Update(const std::vector<std::string>& all_game_paths,
std::function<void(const std::shared_ptr<const GameFile>&)> game_added_to_cache = {}, const GameAddedToCacheFn& game_added_to_cache = {},
std::function<void(const std::string&)> game_removed_from_cache = {}, const GameRemovedFromCacheFn& game_removed_from_cache = {},
const std::atomic_bool& processing_halted = false); const std::atomic_bool& processing_halted = false);
bool UpdateAdditionalMetadata( bool UpdateAdditionalMetadata(const GameUpdatedFn& game_updated = {},
std::function<void(const std::shared_ptr<const GameFile>&)> game_updated = {}, const std::atomic_bool& processing_halted = false);
const std::atomic_bool& processing_halted = false);
bool Load(); bool Load();
bool Save(); bool Save();