Skip to content

fix(pulse): use blocking iterate to prevent busy-spin on boot #1919

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

Closed
markc wants to merge 1 commit into from
Closed

fix(pulse): use blocking iterate to prevent busy-spin on boot #1919

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
14 changes: 11 additions & 3 deletions subscriptions/pulse/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,15 @@ pub fn thread(sender: futures::channel::mpsc::Sender<Event>) {

let _ = context.connect(None, FlagSet::NOFAIL, None);

// Wait for the PulseAudio context to become ready.
// Use blocking iteration to avoid busy-spinning if the server
// is not yet available (e.g. pipewire-pulse starting concurrently).
loop {
if sender.is_closed() {
return;
}

match main_loop.iterate(false) {
match main_loop.iterate(true) {
IterateResult::Success(_) => {}
IterateResult::Err(_e) => {
return;
Expand All @@ -92,8 +95,13 @@ pub fn thread(sender: futures::channel::mpsc::Sender<Event>) {
}
}

if context.get_state() == State::Ready {
break;
match context.get_state() {
State::Ready => break,
State::Failed | State::Terminated => {
log::error!("PulseAudio context connection failed");
return;
}
_ => {} // Unconnected, Connecting, Authorizing, SettingName — keep waiting
}
}

Expand Down