From 59d126d21582d2fd2df05dc33d5eeebaf097204a Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 1 Jul 2025 20:16:36 +0200 Subject: [PATCH] PPCSymbolDB: Rename m_write_lock to m_mutex This mutex needs to be locked both when reading and writing, not just when writing. --- Source/Core/Core/PowerPC/PPCSymbolDB.cpp | 8 ++++---- Source/Core/Core/PowerPC/PPCSymbolDB.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index dcef06ed29..e7bf9bd923 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -136,7 +136,7 @@ void PPCSymbolDB::DetermineNoteLayers() Common::Symbol* PPCSymbolDB::GetSymbolFromAddr(u32 addr) { - std::unique_lock lock(m_write_lock); + std::lock_guard lock(m_mutex); if (m_functions.empty()) return nullptr; @@ -161,7 +161,7 @@ Common::Symbol* PPCSymbolDB::GetSymbolFromAddr(u32 addr) Common::Note* PPCSymbolDB::GetNoteFromAddr(u32 addr) { - std::unique_lock lock(m_write_lock); + std::lock_guard lock(m_mutex); if (m_notes.empty()) return nullptr; @@ -209,7 +209,7 @@ std::string_view PPCSymbolDB::GetDescription(u32 addr) void PPCSymbolDB::FillInCallers() { - std::unique_lock lock(m_write_lock); + std::lock_guard lock(m_mutex); for (auto& p : m_functions) { @@ -312,7 +312,7 @@ bool PPCSymbolDB::FindMapFile(std::string* existing_map_file, std::string* writa // Returns true if m_functions was changed. bool PPCSymbolDB::LoadMapOnBoot(const Core::CPUThreadGuard& guard) { - std::lock_guard lock(m_write_lock); + std::lock_guard lock(m_mutex); std::string existing_map_file; if (!PPCSymbolDB::FindMapFile(&existing_map_file, nullptr)) diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.h b/Source/Core/Core/PowerPC/PPCSymbolDB.h index 6e51392195..b182023a54 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.h +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.h @@ -51,5 +51,5 @@ public: static bool FindMapFile(std::string* existing_map_file, std::string* writable_map_file); private: - std::mutex m_write_lock; + std::mutex m_mutex; };