dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPUManager: Remove redundant parameter from PauseAndLock

Browse Source 
PauseAndLock was only called with control_adjacent=false. Remove the
parameter and the function call that was only made when it was true.
This commit is contained in:
Dentomologist 2023-06-04 13:19:44 -07:00
parent 48d48fe1af
commit 8d0dbb0ef6
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Core.cpp
View File

@ -781,7 +781,7 @@ static bool PauseAndLock(Core::System& system, bool do_lock, bool unpause_on_unl
// first pause the CPU
// This acquires a wrapper mutex and converts the current thread into
// a temporary replacement CPU Thread.
was_unpaused = system.GetCPU().PauseAndLock(false);
was_unpaused = system.GetCPU().PauseAndLock();
}
// audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle).

4
Source/Core/Core/HW/CPU.cpp
View File

@ -351,7 +351,7 @@ void CPUManager::Continue()
Core::NotifyStateChanged(Core::State::Running);
}
bool CPUManager::PauseAndLock(const bool control_adjacent)
bool CPUManager::PauseAndLock()
{
m_stepping_lock.lock();
@ -366,8 +366,6 @@ bool CPUManager::PauseAndLock(const bool control_adjacent)
m_state_cpu_idle_cvar.wait(state_lock);
}
if (control_adjacent)
RunAdjacentSystems(false);
state_lock.unlock();
// NOTE: It would make more sense for Core::DeclareAsCPUThread() to keep a

2
Source/Core/Core/HW/CPU.h
View File

@ -95,7 +95,7 @@ public:
// Cannot be used by System threads as it will deadlock. It is threadsafe otherwise.
// "control_adjacent" causes PauseAndLock to behave like SetStepping by modifying the
// state of the Audio and FIFO subsystems as well.
bool PauseAndLock(bool control_adjacent);
bool PauseAndLock();
void RestoreStateAndUnlock(bool unpause_on_unlock, bool control_adjacent);
// Adds a job to be executed during on the CPU thread. This should be combined with