diff options
author | Merry <git@mary.rs> | 2022-04-07 20:31:48 +0200 |
---|---|---|
committer | Merry <git@mary.rs> | 2022-04-07 20:44:07 +0200 |
commit | 6a071c42d27839d2444903991cef496d94a6c8e3 (patch) | |
tree | e77d52acf83f0a81a7118dc0a439ea7823ee6689 /src/core/tools/freezer.cpp | |
parent | core/hle: Replace lock_guard with scoped_lock (diff) | |
download | yuzu-6a071c42d27839d2444903991cef496d94a6c8e3.tar yuzu-6a071c42d27839d2444903991cef496d94a6c8e3.tar.gz yuzu-6a071c42d27839d2444903991cef496d94a6c8e3.tar.bz2 yuzu-6a071c42d27839d2444903991cef496d94a6c8e3.tar.lz yuzu-6a071c42d27839d2444903991cef496d94a6c8e3.tar.xz yuzu-6a071c42d27839d2444903991cef496d94a6c8e3.tar.zst yuzu-6a071c42d27839d2444903991cef496d94a6c8e3.zip |
Diffstat (limited to 'src/core/tools/freezer.cpp')
-rw-r--r-- | src/core/tools/freezer.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 032c71aff..c81dc0e52 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp @@ -80,7 +80,7 @@ bool Freezer::IsActive() const { } void Freezer::Clear() { - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; LOG_DEBUG(Common_Memory, "Clearing all frozen memory values."); @@ -88,7 +88,7 @@ void Freezer::Clear() { } u64 Freezer::Freeze(VAddr address, u32 width) { - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; const auto current_value = MemoryReadWidth(memory, width, address); entries.push_back({address, width, current_value}); @@ -101,7 +101,7 @@ u64 Freezer::Freeze(VAddr address, u32 width) { } void Freezer::Unfreeze(VAddr address) { - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; LOG_DEBUG(Common_Memory, "Unfreezing memory for address={:016X}", address); @@ -109,13 +109,13 @@ void Freezer::Unfreeze(VAddr address) { } bool Freezer::IsFrozen(VAddr address) const { - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; return FindEntry(address) != entries.cend(); } void Freezer::SetFrozenValue(VAddr address, u64 value) { - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; const auto iter = FindEntry(address); @@ -132,7 +132,7 @@ void Freezer::SetFrozenValue(VAddr address, u64 value) { } std::optional<Freezer::Entry> Freezer::GetEntry(VAddr address) const { - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; const auto iter = FindEntry(address); @@ -144,7 +144,7 @@ std::optional<Freezer::Entry> Freezer::GetEntry(VAddr address) const { } std::vector<Freezer::Entry> Freezer::GetEntries() const { - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; return entries; } @@ -165,7 +165,7 @@ void Freezer::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) { return; } - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; for (const auto& entry : entries) { LOG_DEBUG(Common_Memory, @@ -178,7 +178,7 @@ void Freezer::FrameCallback(std::uintptr_t, std::chrono::nanoseconds ns_late) { } void Freezer::FillEntryReads() { - std::lock_guard lock{entries_mutex}; + std::scoped_lock lock{entries_mutex}; LOG_DEBUG(Common_Memory, "Updating memory freeze entries to current values."); |