mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-12 02:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PPCSymbolDB: Wait for locking to succeed

Browse source 
9395238 added a mutex to PPCSymbolDB, and made functions return with an
"empty" result if called while the mutex is locked. This new behavior
has the potential to affect not only less important call sites like the
symbol printing mentioned in a comment, but also the JIT deciding if it
should HLE a function.

A later commit in this pull request decreases the amount of lock
contention, reducing the performance impact of this commit.
This commit is contained in:
JosJuice 2025-06-29 23:24:08 +02:00
commit d62e21e7b6
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Core/Core/PowerPC/PPCSymbolDB.cpp
View file

@ -136,11 +136,8 @@ void PPCSymbolDB::DetermineNoteLayers()
Common::Symbol* PPCSymbolDB::GetSymbolFromAddr(u32 addr)
{
// If m_functions is changing, there should be a PPCSymbolsChanged signal afterward. The signal
// will re-update persistent symbol displays by calling this function. Only one-off calls to this
// function, such as printing the symbol to console, should be affected by leaving early.
std::unique_lock<std::mutex> lock(m_write_lock, std::try_to_lock);
if (!lock.owns_lock() || m_functions.empty())
std::unique_lock<std::mutex> lock(m_write_lock);
if (m_functions.empty())
return nullptr;
auto it = m_functions.lower_bound(addr);
@ -164,8 +161,8 @@ Common::Symbol* PPCSymbolDB::GetSymbolFromAddr(u32 addr)
Common::Note* PPCSymbolDB::GetNoteFromAddr(u32 addr)
{
std::unique_lock<std::mutex> lock(m_write_lock, std::try_to_lock);
if (!lock.owns_lock() || m_notes.empty())
std::unique_lock<std::mutex> lock(m_write_lock);
if (m_notes.empty())
return nullptr;
auto itn = m_notes.lower_bound(addr);
@ -212,9 +209,7 @@ std::string_view PPCSymbolDB::GetDescription(u32 addr)
void PPCSymbolDB::FillInCallers()
{
std::unique_lock<std::mutex> lock(m_write_lock, std::try_to_lock);
if (!lock.owns_lock())
return;
std::unique_lock<std::mutex> lock(m_write_lock);
for (auto& p : m_functions)
{
@ -314,10 +309,9 @@ bool PPCSymbolDB::FindMapFile(std::string* existing_map_file, std::string* writa
return false;
}
// Returns true if m_functions was changed.
bool PPCSymbolDB::LoadMapOnBoot(const Core::CPUThreadGuard& guard)
{
// Loads from emuthread and can crash with main thread accessing the map. Any other loads will be
// done on the main thread and should be safe. Returns true if m_functions was changed.
std::lock_guard lock(m_write_lock);
std::string existing_map_file;