me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use oneshot and future::select to cancel streams

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-12-07 08:51:44 +01:00
parent e55dfa7551
commit 48145ba51e
3 changed files with 48 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

50
winit/src/application.rs
View file

@ -2,8 +2,8 @@ use crate::{
conversion,
input::{keyboard, mouse},
renderer::{Target, Windowed},
subscription, Cache, Command, Container, Debug, Element, Event, Length,
MouseCursor, Settings, Subscription, UserInterface,
Cache, Command, Container, Debug, Element, Event, Length, MouseCursor,
Settings, Subscription, UserInterface,
};
use std::collections::HashMap;
@ -420,7 +420,7 @@ fn spawn<Message: Send>(
}
pub struct Subscriptions {
alive: HashMap<u64, Box<dyn subscription::Handle>>,
alive: HashMap<u64, futures::channel::oneshot::Sender<()>>,
}
impl Subscriptions {
@ -436,46 +436,44 @@ impl Subscriptions {
thread_pool: &mut futures::executor::ThreadPool,
proxy: &winit::event_loop::EventLoopProxy<Message>,
) {
use futures::stream::StreamExt;
use futures::{future::FutureExt, stream::StreamExt};
let definitions = subscriptions.definitions();
let handles = subscriptions.handles();
let mut alive = std::collections::HashSet::new();
for definition in definitions {
let id = definition.id();
for handle in handles {
let id = handle.id();
let _ = alive.insert(id);
if !self.alive.contains_key(&id) {
let (stream, handle) = definition.stream();
let (cancel, cancelled) = futures::channel::oneshot::channel();
let stream = handle.stream();
let proxy =
std::sync::Arc::new(std::sync::Mutex::new(proxy.clone()));
let future = stream.for_each(move |message| {
proxy
.lock()
.expect("Acquire event loop proxy lock")
.send_event(message)
.expect("Send subscription result to event loop");
let future = futures::future::select(
cancelled,
stream.for_each(move |message| {
proxy
.lock()
.expect("Acquire event loop proxy lock")
.send_event(message)
.expect("Send subscription result to event loop");
futures::future::ready(())
});
futures::future::ready(())
}),
)
.map(|_| ());
thread_pool.spawn_ok(future);
let _ = self.alive.insert(id, handle);
let _ = self.alive.insert(id, cancel);
}
}
self.alive.retain(|id, handle| {
let is_still_alive = alive.contains(&id);
if !is_still_alive {
handle.cancel();
}
is_still_alive
});
self.alive.retain(|id, _| alive.contains(&id));
}
}