oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/alsa: don't lock the mutex in CancelInternal()

Browse Source 
CancelInternal() doesn't need to be protected because it is called
synchronously from Cancel().
This commit is contained in:
Max Kellermann 2018-11-14 11:49:48 +01:00
parent 020371f145
commit b477f86c92
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -796,6 +796,9 @@ AlsaOutput::Drain()
inline void inline void
AlsaOutput::CancelInternal() noexcept AlsaOutput::CancelInternal() noexcept
{ {
/* this method doesn't need to lock the mutex because while it
runs, the calling thread is blocked inside Cancel() */
must_prepare = true; must_prepare = true;
snd_pcm_drop(pcm); snd_pcm_drop(pcm);
@ -804,10 +807,7 @@ AlsaOutput::CancelInternal() noexcept
period_buffer.Clear(); period_buffer.Clear();
ring_buffer->reset(); ring_buffer->reset();
{ active = false;
const std::lock_guard<Mutex> lock(mutex);
active = false;
}
MultiSocketMonitor::Reset(); MultiSocketMonitor::Reset();
defer_invalidate_sockets.Cancel(); defer_invalidate_sockets.Cancel();