src/server/worker_task.rs: implement abort channel

This commit is contained in:
Dietmar Maurer
2019-04-15 09:38:05 +02:00
parent 912524752e
commit 75bc49bed7
2 changed files with 37 additions and 1 deletions

View File

@ -341,6 +341,7 @@ impl std::fmt::Display for WorkerTask {
struct WorkerTaskData {
logger: FileLogger,
progress: f64, // 0..1
pub abort_listeners: Vec<oneshot::Sender<()>>,
}
impl Drop for WorkerTask {
@ -383,6 +384,7 @@ impl WorkerTask {
data: Mutex::new(WorkerTaskData {
logger,
progress: 0.0,
abort_listeners: vec![],
}),
});
@ -492,6 +494,16 @@ impl WorkerTask {
pub fn request_abort(&self) {
eprintln!("set abort flag for worker {}", self.upid);
self.abort_requested.store(true, Ordering::SeqCst);
// noitify listeners
let mut data = self.data.lock().unwrap();
loop {
match data.abort_listeners.pop() {
None => { break; },
Some(ch) => {
let _ = ch.send(()); // ignore erros here
},
}
}
}
/// Test if abort was requested.
@ -506,4 +518,17 @@ impl WorkerTask {
}
Ok(())
}
/// Get a future which resolves on task abort
pub fn abort_future(&self) -> oneshot::Receiver<()> {
let (tx, rx) = oneshot::channel::<()>();
let mut data = self.data.lock().unwrap();
if self.abort_requested() {
let _ = tx.send(());
} else {
data.abort_listeners.push(tx);
}
rx
}
}