fix(alsa): hanging double-opens with BufferSize::Fixed om some drivers#1214
Open
roderickvd wants to merge 6 commits into
Open
fix(alsa): hanging double-opens with BufferSize::Fixed om some drivers#1214roderickvd wants to merge 6 commits into
roderickvd wants to merge 6 commits into
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the ALSA backend to avoid an extra open/close cycle when validating BufferSize::Fixed (which can leave some drivers in a bad state), and adds a defensive PCM-state check when poll() times out to prevent hangs when error events aren’t delivered.
Changes:
- Move
BufferSize::Fixedrange validation toset_hw_params_from_format()so it uses the same PCM handle as the streaming open (avoids a second open/close). - On
poll()timeout, query PCM state and surfaceDisconnected/XRun/Suspendedconditions even ifPOLLERR/POLLHUPwasn’t delivered.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
roderickvd
changed the title
|
As I wrote in the issue there are no apparent changes for me, but it also does not negatively effect the current behavior on the rasperry pi zero w, so I would say its better than before. |
Comment on lines
518
to
520
| let min_channels = hw_params.get_channels_min()?; | ||
| let max_channels = hw_params.get_channels_max()?; | ||
| let max_channels = hw_params.get_channels_max()?.min(32); // TODO: cap at 32 or too many configs | ||
|
|
| Err(err) if err.errno() == libc::EPIPE => { | ||
| return Err(Error::with_message(ErrorKind::Xrun, err.to_string())) | ||
| } | ||
| Err(err) if err.errno() == libc::EPIPE => return Err(ErrorKind::Xrun.into()), |
Comment on lines
1682
to
1691
| impl From<alsa::Error> for Error { | ||
| fn from(err: alsa::Error) -> Self { | ||
| match err.errno() { | ||
| libc::ENODEV | libc::ENOENT | LIBC_ENOTSUPP => { | ||
| Error::with_message(ErrorKind::DeviceNotAvailable, err.to_string()) | ||
| } | ||
| libc::EPERM | libc::EACCES => { | ||
| Error::with_message(ErrorKind::PermissionDenied, err.to_string()) | ||
| } | ||
| libc::EBUSY | libc::EAGAIN => { | ||
| Error::with_message(ErrorKind::DeviceBusy, err.to_string()) | ||
| } | ||
| libc::EINVAL => Error::with_message(ErrorKind::InvalidInput, err.to_string()), | ||
| libc::EPIPE => Error::with_message(ErrorKind::Xrun, err.to_string()), | ||
| libc::ENOSYS => Error::with_message(ErrorKind::UnsupportedOperation, err.to_string()), | ||
| libc::ENODEV | libc::ENOENT | LIBC_ENOTSUPP => ErrorKind::DeviceNotAvailable.into(), | ||
| libc::EPERM | libc::EACCES => ErrorKind::PermissionDenied.into(), | ||
| libc::EBUSY | libc::EAGAIN => ErrorKind::DeviceBusy.into(), | ||
| libc::EINVAL | libc::ENOSYS => ErrorKind::UnsupportedConfig.into(), | ||
| libc::EPIPE => ErrorKind::Xrun.into(), | ||
| _ => Error::with_message(ErrorKind::BackendError, err.to_string()), | ||
| } |
| libc::ENODEV | libc::ENOENT | LIBC_ENOTSUPP => ErrorKind::DeviceNotAvailable.into(), | ||
| libc::EPERM | libc::EACCES => ErrorKind::PermissionDenied.into(), | ||
| libc::EBUSY | libc::EAGAIN => ErrorKind::DeviceBusy.into(), | ||
| libc::EINVAL => ErrorKind::UnsupportedConfig.into(), |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The range validation for
BufferSize::Fixedwas callingdefault_output_config()before opening the stream, which opened and closed the PCM device once just to get the buffer size range. This may leave the driver in a bad state for the subsequent streaming open.Second, to defend against hanging processes in such an event, the worker now checks PCM state when
poll()times out.Fixes #1157