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-11-22 19:41:00 +00:00
Code Issues Projects Releases Wiki Activity

fallbackswitch: ensure strict ordering when taking mutexes

Browse source 
Should prevent deadlocks.

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

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

@ -36,6 +36,14 @@ static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
) )
}); });
/* Mutex locking ordering:
- self.settings
- self.state
- self.active_sinkpad
- pad.settings
- pad.state
*/
#[derive(Debug)] #[derive(Debug)]
#[allow(clippy::large_enum_variant)] #[allow(clippy::large_enum_variant)]
enum CapsInfo { enum CapsInfo {
@ -473,8 +481,8 @@ impl FallbackSwitch {
if active_sinkpad.as_ref() == Some(pad) { if active_sinkpad.as_ref() == Some(pad) {
continue; continue;
} }
let pad_state = pad_imp.state.lock();
let pad_settings = pad_imp.settings.lock().clone(); let pad_settings = pad_imp.settings.lock().clone();
let pad_state = pad_imp.state.lock();
#[allow(clippy::collapsible_if)] #[allow(clippy::collapsible_if)]
/* If this pad has data that arrived within the 'timeout' window /* If this pad has data that arrived within the 'timeout' window
* before the timeout fired, we can switch to it */ * before the timeout fired, we can switch to it */
@ -638,8 +646,8 @@ impl FallbackSwitch {
buffer: gst::Buffer, buffer: gst::Buffer,
from_gap: Option<&gst::event::Gap>, from_gap: Option<&gst::event::Gap>,
) -> Result<gst::FlowSuccess, gst::FlowError> { ) -> Result<gst::FlowSuccess, gst::FlowError> {
let mut state = self.state.lock();
let settings = self.settings.lock().clone(); let settings = self.settings.lock().clone();
let mut state = self.state.lock();
let pad = pad.downcast_ref::<super::FallbackSwitchSinkPad>().unwrap(); let pad = pad.downcast_ref::<super::FallbackSwitchSinkPad>().unwrap();
let pad_imp = pad.imp(); let pad_imp = pad.imp();
@ -1176,8 +1184,8 @@ impl FallbackSwitch {
} }
} }
let mut state = self.state.lock();
let settings = self.settings.lock().clone(); let settings = self.settings.lock().clone();
let mut state = self.state.lock();
min_latency = min_latency.max(settings.min_upstream_latency); min_latency = min_latency.max(settings.min_upstream_latency);
state.upstream_latency = min_latency; state.upstream_latency = min_latency;
log!(CAT, obj: pad, "Upstream latency {}", min_latency); log!(CAT, obj: pad, "Upstream latency {}", min_latency);