|
|
@ -10,9 +10,13 @@ use std::{
|
|
|
|
Context,
|
|
|
|
Context,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
use std::marker::PhantomData;
|
|
|
|
use std::marker::{
|
|
|
|
|
|
|
|
PhantomData,
|
|
|
|
|
|
|
|
Send,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
use std::{fmt, error};
|
|
|
|
|
|
|
|
|
|
|
|
macro_rules! with_cancel {
|
|
|
|
#[macro_export] macro_rules! with_cancel {
|
|
|
|
($block:expr, $tok:expr) => {
|
|
|
|
($block:expr, $tok:expr) => {
|
|
|
|
{
|
|
|
|
{
|
|
|
|
::tokio::select!{
|
|
|
|
::tokio::select!{
|
|
|
@ -39,6 +43,17 @@ where T: CancelFuture
|
|
|
|
#[derive(Debug)]
|
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct TaskCancelledError;
|
|
|
|
pub struct TaskCancelledError;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl error::Error for TaskCancelledError{}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl fmt::Display for TaskCancelledError
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
write!(f, "async task was explicitly cancelled")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// A future used for cancelling an operation
|
|
|
|
/// A future used for cancelling an operation
|
|
|
|
pub trait CancelFuture: Future{}
|
|
|
|
pub trait CancelFuture: Future{}
|
|
|
|
|
|
|
|
|
|
|
@ -77,7 +92,7 @@ impl CancellationTokenSource
|
|
|
|
/// Instruct all tokens to cancel, then drop this source.
|
|
|
|
/// Instruct all tokens to cancel, then drop this source.
|
|
|
|
///
|
|
|
|
///
|
|
|
|
/// When a source is dropped without cancelling, its tokens never complete.
|
|
|
|
/// When a source is dropped without cancelling, its tokens never complete.
|
|
|
|
#[inline] pub fn cancel_consume(mut self)
|
|
|
|
#[inline] pub fn into_cancel(mut self)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
self.cancel();
|
|
|
|
self.cancel();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -185,3 +200,16 @@ impl<T> Future for NeverFuture<T>
|
|
|
|
Poll::Pending
|
|
|
|
Poll::Pending
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// Spawn a new task with a cancellation future
|
|
|
|
|
|
|
|
pub fn spawn_with_cancel<F, C, T>(fut: F, tok: C) -> tokio::task::JoinHandle<Result<T, TaskCancelledError>>
|
|
|
|
|
|
|
|
where F: Future<Output=T> + Send + Unpin + 'static,
|
|
|
|
|
|
|
|
C: CancelFuture + Unpin + Send + 'static,
|
|
|
|
|
|
|
|
T: Send + 'static,
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
use futures::prelude::*;
|
|
|
|
|
|
|
|
tokio::spawn(futures::future::select(fut, tok).map(|either| match either {
|
|
|
|
|
|
|
|
futures::future::Either::Left((complete, _)) => Ok(complete),
|
|
|
|
|
|
|
|
_ => Err(TaskCancelledError),
|
|
|
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
}
|
|
|
|