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-26 13:31:00 +00:00
Code Issues Projects Releases Wiki Activity

reqwesthttpsrc: Simplify code to block on futures

Browse source
This commit is contained in:
Sebastian Dröge 2019-12-31 14:17:56 +02:00
parent b1e85c7fa0
commit 6d2ab03f56
1 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -687,13 +687,7 @@ impl ReqwestHttpSrc {
}
};
let res = match block_on(&*RUNTIME, future) {
Ok(res) => res,
Err(_) => Err(Some(gst_error_msg!(
gst::ResourceError::Read,
["Join error"]
))),
};
let res = RUNTIME.enter(|| futures::executor::block_on(future));
/* Clear out the canceller */
let _ = self.canceller.lock().unwrap().take();
@ -702,29 +696,6 @@ impl ReqwestHttpSrc {
}
}
// Until tokio 0.2.0-alpha.6 `Runtime::block_on()` didn't require a mutable reference
// to the runtime. Now it does and we need to work around that.
// See https://github.com/tokio-rs/tokio/issues/2042
fn block_on<F>(
runtime: &tokio::runtime::Runtime,
future: F,
) -> Result<F::Output, tokio::task::JoinError>
where
F: Send + Future,
F::Output: Send + 'static,
{
use futures::task::FutureObj;
use std::mem;
let future = FutureObj::new(Box::pin(future));
// We make sure here to block until the future is completely handled before returning
let future = unsafe { mem::transmute::<_, FutureObj<'static, _>>(future) };
let join_handle = runtime.spawn(future);
futures::executor::block_on(join_handle)
}
impl ObjectImpl for ReqwestHttpSrc {
glib_object_impl!();