mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-12-23 10:30:40 +00:00
Code Issues Projects Releases Wiki Activity

fallbackswitch: prevent deadlocks in chain function

Browse source 
Calling schedule_timeout() may result in handle_timeout() being called right away,
which will need pad state locks which was still hold in chain().

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1300>
This commit is contained in:
Guillaume Desmottes 2023-08-14 11:39:49 +02:00
parent 100333c021
commit d3da30be6d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utils/fallbackswitch/src/fallbackswitch/imp.rs
View file

@ -829,11 +829,14 @@ impl FallbackSwitch {
is_active = self.active_sinkpad.lock().as_ref() == Some(pad); is_active = self.active_sinkpad.lock().as_ref() == Some(pad);
} }
let mut pad_state = pad_imp.state.lock(); let pad_state = pad_imp.state.lock();
if pad_state.flushing { if pad_state.flushing {
debug!(CAT, imp: self, "Flushing"); debug!(CAT, imp: self, "Flushing");
return Err(gst::FlowError::Flushing); return Err(gst::FlowError::Flushing);
} }
// calling schedule_timeout() may result in handle_timeout() being called right away,
// which will need pad state locks, so drop it now to prevent deadlocks.
drop(pad_state);
if is_active { if is_active {
if start_running_time if start_running_time
@ -879,6 +882,8 @@ impl FallbackSwitch {
} }
} }
let mut pad_state = pad_imp.state.lock();
if let Some(running_time) = end_running_time { if let Some(running_time) = end_running_time {
pad_state.current_running_time = Some(running_time); pad_state.current_running_time = Some(running_time);
} }