ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a race condition when shutting down audio stream 

The main EmuThread (in Core) is responsible for both initialising the
audio stream and shutting it down properly.

When the core is shutting down (when state is State::PowerDown), it is
possible that the CPU or CPU-GPU thread and the UI thread will both
try to stop the audio stream at the same time, which is an issue
because some audio backends such as cubeb are not thread-safe.

This commit prevents the race from ever happening in the first place
by removing the call to AudioCommon::SetSoundStreamRunning from
CPU::RunAdjacentSystems, which is actually completely unnecessary when
shutting down because Core::EmuThread is going to stop the stream and
perform more cleanup anyway.

Should fix https://bugs.dolphin-emu.org/issues/11722
This commit is contained in:
Léo Lam 2019-05-11 16:26:03 +02:00
parent a0a0a68801
commit 7c46497f04
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,6 +147,8 @@ static void RunAdjacentSystems(bool running)
{ {
// NOTE: We're assuming these will not try to call Break or EnableStepping. // NOTE: We're assuming these will not try to call Break or EnableStepping.
Fifo::EmulatorState(running); Fifo::EmulatorState(running);
// Core is responsible for shutting down the sound stream.
if (s_state != State::PowerDown)
AudioCommon::SetSoundStreamRunning(running); AudioCommon::SetSoundStreamRunning(running);
} }