diff options
author | bunnei <bunneidev@gmail.com> | 2020-08-12 05:07:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-12 05:07:17 +0200 |
commit | a8ffe6eee427087683f02290d83064e1cb754cb2 (patch) | |
tree | 228c3223454ee6655a9f270b232c393cfd911c43 /src/core/tools/freezer.cpp | |
parent | Merge pull request #4493 from jbeich/dragonfly (diff) | |
parent | freezer: Move entry finding to its own function (diff) | |
download | yuzu-a8ffe6eee427087683f02290d83064e1cb754cb2.tar yuzu-a8ffe6eee427087683f02290d83064e1cb754cb2.tar.gz yuzu-a8ffe6eee427087683f02290d83064e1cb754cb2.tar.bz2 yuzu-a8ffe6eee427087683f02290d83064e1cb754cb2.tar.lz yuzu-a8ffe6eee427087683f02290d83064e1cb754cb2.tar.xz yuzu-a8ffe6eee427087683f02290d83064e1cb754cb2.tar.zst yuzu-a8ffe6eee427087683f02290d83064e1cb754cb2.zip |
Diffstat (limited to 'src/core/tools/freezer.cpp')
-rw-r--r-- | src/core/tools/freezer.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 2003e096f..5c674a099 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp @@ -107,28 +107,21 @@ void Freezer::Unfreeze(VAddr address) { LOG_DEBUG(Common_Memory, "Unfreezing memory for address={:016X}", address); - entries.erase( - std::remove_if(entries.begin(), entries.end(), - [&address](const Entry& entry) { return entry.address == address; }), - entries.end()); + std::erase_if(entries, [address](const Entry& entry) { return entry.address == address; }); } bool Freezer::IsFrozen(VAddr address) const { std::lock_guard lock{entries_mutex}; - return std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { - return entry.address == address; - }) != entries.end(); + return FindEntry(address) != entries.cend(); } void Freezer::SetFrozenValue(VAddr address, u64 value) { std::lock_guard lock{entries_mutex}; - const auto iter = std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { - return entry.address == address; - }); + const auto iter = FindEntry(address); - if (iter == entries.end()) { + if (iter == entries.cend()) { LOG_ERROR(Common_Memory, "Tried to set freeze value for address={:016X} that is not frozen!", address); return; @@ -143,11 +136,9 @@ void Freezer::SetFrozenValue(VAddr address, u64 value) { std::optional<Freezer::Entry> Freezer::GetEntry(VAddr address) const { std::lock_guard lock{entries_mutex}; - const auto iter = std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { - return entry.address == address; - }); + const auto iter = FindEntry(address); - if (iter == entries.end()) { + if (iter == entries.cend()) { return std::nullopt; } @@ -160,6 +151,16 @@ std::vector<Freezer::Entry> Freezer::GetEntries() const { return entries; } +Freezer::Entries::iterator Freezer::FindEntry(VAddr address) { + return std::find_if(entries.begin(), entries.end(), + [address](const Entry& entry) { return entry.address == address; }); +} + +Freezer::Entries::const_iterator Freezer::FindEntry(VAddr address) const { + return std::find_if(entries.begin(), entries.end(), + [address](const Entry& entry) { return entry.address == address; }); +} + void Freezer::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) { if (!IsActive()) { LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events."); |