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-06-02 13:29:50 +00:00
Code Issues Projects Releases Wiki Activity

reqwesthttpsrc/s3: Unlock canceller while waiting for the future to be resolved

Browse source 
Otherwise nothing can ever access the canceller and unlocking does not
work.

meh
This commit is contained in:
Sebastian Dröge 2019-10-01 22:33:43 +03:00
parent 69aefb15f7
commit e90099bad3
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-plugin-reqwest/src/reqwesthttpsrc.rs
View file

@ -436,6 +436,7 @@ impl ReqwestHttpSrc {
let (sender, receiver) = oneshot::channel::<Bytes>();
canceller.replace(sender);
drop(canceller);
// wrapping timeout around future
let future_timeout = if timeout == 0 {
@ -463,6 +464,7 @@ impl ReqwestHttpSrc {
});
/* Clear out the canceller */
canceller = self.canceller.lock().unwrap();
*canceller = None;
res

8
gst-plugin-s3/src/s3utils.rs
View file

@ -20,10 +20,11 @@ where
F: Send + Future<Error = gst::ErrorMessage> + 'static,
F::Item: Send,
{
let mut canceller = canceller.lock().unwrap();
let mut canceller_guard = canceller.lock().unwrap();
let (sender, receiver) = oneshot::channel::<T>();
canceller.replace(sender);
canceller_guard.replace(sender);
drop(canceller_guard);
let unlock_error = gst_error_msg!(gst::ResourceError::Busy, ["unlock"]);
@ -40,7 +41,8 @@ where
});
/* Clear out the canceller */
*canceller = None;
canceller_guard = canceller.lock().unwrap();
*canceller_guard = None;
res
}