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-29 15:01:07 +00:00
Code Issues Projects Releases Wiki Activity

aws/s3hlssink: Fix deadlock on EOS

Browse source 
In state change to NULL, we take state lock and call stop. When stop
is called, we will try to upload queued segments in S3 request thread.
That tries to take the state lock again and deadlocks.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1076>
This commit is contained in:
Sanchayan Maity 2023-02-03 17:00:57 +05:30
parent 41aa1e51da
commit 6006a0ba36
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
net/aws/src/s3hlssink/imp.rs
View file

@ -408,6 +408,9 @@ impl S3HlsSink {
} }
}; };
}; };
let mut state = self.state.lock().unwrap();
*state = State::Stopped
} }
fn create_stats(&self) -> gst::Structure { fn create_stats(&self) -> gst::Structure {
@ -649,6 +652,7 @@ impl ObjectImpl for S3HlsSink {
State::Started(ref mut state) => state.num_uploads_started += 1, State::Started(ref mut state) => state.num_uploads_started += 1,
State::Stopped => unreachable!("State not started yet"), State::Stopped => unreachable!("State not started yet"),
}; };
drop(state);
let s3_location = args[1].get::<&str>().unwrap(); let s3_location = args[1].get::<&str>().unwrap();
let upload = S3Upload::new( let upload = S3Upload::new(
@ -683,6 +687,7 @@ impl ObjectImpl for S3HlsSink {
State::Started(ref mut state) => state.num_uploads_started += 1, State::Started(ref mut state) => state.num_uploads_started += 1,
State::Stopped => unreachable!("State not started yet"), State::Stopped => unreachable!("State not started yet"),
}; };
drop(state);
let s3_location = args[1].get::<&str>().unwrap(); let s3_location = args[1].get::<&str>().unwrap();
let upload = S3Upload::new( let upload = S3Upload::new(
@ -808,10 +813,12 @@ impl ElementImpl for S3HlsSink {
* in turn will require the settings lock. * in turn will require the settings lock.
*/ */
let settings = self.settings.lock().unwrap(); let settings = self.settings.lock().unwrap();
let mut state = self.state.lock().unwrap();
match transition { match transition {
gst::StateChange::ReadyToPaused => *state = State::Started(Started::default()), gst::StateChange::ReadyToPaused => {
let mut state = self.state.lock().unwrap();
*state = State::Started(Started::default());
}
gst::StateChange::PausedToPlaying => { gst::StateChange::PausedToPlaying => {
let s3_txc = settings.s3_txc.clone(); let s3_txc = settings.s3_txc.clone();
if let Some(tx) = s3_txc { if let Some(tx) = s3_txc {
@ -849,8 +856,6 @@ impl ElementImpl for S3HlsSink {
* pending requests. * pending requests.
*/ */
self.stop(); self.stop();
*state = State::Stopped
} }
_ => (), _ => (),
} }