Skip to content

ALSA: Avoid closing a device while the audio thread is still using it #1707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
emezeske wants to merge 1 commit into
base: develop
Choose a base branch
from
+11 −1
Draft

ALSA: Avoid closing a device while the audio thread is still using it #1707

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion modules/juce_audio_devices/native/juce_ALSA_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,17 @@ class ALSAThread final : public Thread

const int callbacksToStop = numCallbacks;

if ((! waitForThreadToExit (400)) && audioIoInProgress && numCallbacks == callbacksToStop)
// Closing the devices from this thread while the audio thread is
// still inside snd_pcm_readi/writei frees the pcm out from under it,
// so the wait has to allow for one full period of i/o before
// concluding that the thread is stuck rather than simply busy: a
// large buffer at a low sample rate takes far longer than the base
// timeout on its own. Capped so that closing stays responsive
// whatever the device reports.
const auto ioPeriodMs = sampleRate > 0.0 ? (int) (1000.0 * bufferSize / sampleRate) : 0;
const auto stuckTimeoutMs = 400 + jmin (2000, ioPeriodMs);

if ((! waitForThreadToExit (stuckTimeoutMs)) && audioIoInProgress && numCallbacks == callbacksToStop)
{
JUCE_ALSA_LOG ("Thread is stuck in i/o. Is pulseaudio suspended?");

Expand Down
Loading