output/alsa: fix race condition on early snd_pcm_writei() error

During UnlockActivate() while the mutex is unlocked, the IOThread can set a new error condition, and will never again wake up the OutputThread. This race condition can cause a deadlock in the OutputThread.

output/alsa: fix race condition on early snd_pcm_writei() error
47dffe66 · Max Kellermann · 6636c69a · 47dffe66
Commit 47dffe66 authored Feb 15, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

AlsaOutputPlugin.cxx src/output/plugins/AlsaOutputPlugin.cxx +6 -0

No files found.
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -1211,6 +1211,12 @@ AlsaOutput::Play(const void *chunk, size_t size)
 		   snd_pcm_writei() */
 		UnlockActivate();

+		/* check the error again, because a new one may have
+		   been set while our mutex was unlocked in
+		   UnlockActivate() */
+		if (error)
+			std::rethrow_exception(error);
+
 		/* wait for the DispatchSockets() to make room in the
 		   ring_buffer */
 		cond.wait(mutex);