eric/pmomusic
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix borrow checker errors in header caching

Browse Source 
Clone header value before modifying self to avoid holding RwLockReadGuard
while mutating buffer and state fields in both FlacClientStream and
IcyClientStream poll_read() implementations.
This commit is contained in:
Claude
2025-11-11 20:42:33 +00:00
parent d595476aba
commit 98a07cf737
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pmoaudio-ext/src/sinks/streaming_flac_sink.rs
View File

@@ -228,18 +228,19 @@ impl AsyncRead for FlacClientStream {
loop {
// If in header state, send the header first
if matches!(self.state, FlacStreamState::SendingHeader) {
if let Ok(guard) = self.handle.flac_header.try_read() {
if let Some(header) = guard.as_ref() {
self.buffer.extend(header.iter());
info!("Sending cached FLAC header to new client ({} bytes)", header.len());
self.state = FlacStreamState::Streaming;
continue; // Now copy header to output buffer
} else {
// Header not yet captured, skip to streaming
self.state = FlacStreamState::Streaming;
}
let header_opt = if let Ok(guard) = self.handle.flac_header.try_read() {
guard.clone()
} else {
// Can't acquire lock, skip to streaming
None
};
if let Some(header) = header_opt {
self.buffer.extend(header.iter());
info!("Sending cached FLAC header to new client ({} bytes)", header.len());
self.state = FlacStreamState::Streaming;
continue; // Now copy header to output buffer
} else {
// Header not yet captured or can't acquire lock, skip to streaming
self.state = FlacStreamState::Streaming;
}
}
@@ -381,18 +382,19 @@ impl AsyncRead for IcyClientStream {
loop {
// If in header state, send the header first
if matches!(self.state, FlacStreamState::SendingHeader) {
if let Ok(guard) = self.handle.flac_header.try_read() {
if let Some(header) = guard.as_ref() {
self.buffer.extend(header.iter());
info!("Sending cached FLAC header to new ICY client ({} bytes)", header.len());
self.state = FlacStreamState::Streaming;
continue; // Now copy header to output buffer
} else {
// Header not yet captured, skip to streaming
self.state = FlacStreamState::Streaming;
}
let header_opt = if let Ok(guard) = self.handle.flac_header.try_read() {
guard.clone()
} else {
// Can't acquire lock, skip to streaming
None
};
if let Some(header) = header_opt {
self.buffer.extend(header.iter());
info!("Sending cached FLAC header to new ICY client ({} bytes)", header.len());
self.state = FlacStreamState::Streaming;
continue; // Now copy header to output buffer
} else {
// Header not yet captured or can't acquire lock, skip to streaming
self.state = FlacStreamState::Streaming;
}
}