Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@onestream.live>2023-08-14 12:39:49 +0300
committerSebastian Dröge <sebastian@centricular.com>2023-09-20 19:44:14 +0300
commite1d35536adfa9049a9d58888855abc69597ac4bc (patch)
treeab2874fbee9d968043fad1e888b5c606edf6dd94
parent74b6955e0e58bec614b26f51304a47404251fda5 (diff)
fallbackswitch: prevent deadlocks in chain function
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/1330>
-rw-r--r--utils/fallbackswitch/src/fallbackswitch/imp.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/fallbackswitch/src/fallbackswitch/imp.rs b/utils/fallbackswitch/src/fallbackswitch/imp.rs
index 6be708ea3..3e76be4b4 100644
--- a/utils/fallbackswitch/src/fallbackswitch/imp.rs
+++ b/utils/fallbackswitch/src/fallbackswitch/imp.rs
@@ -829,11 +829,14 @@ impl FallbackSwitch {
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 {
debug!(CAT, imp: self, "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 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 {
pad_state.current_running_time = Some(running_time);
}