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

Fix SelectNextSome poll after termination panic in iced_winit::Proxy

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-04-17 15:54:12 +02:00
parent ba705d63dd
commit a05b8044a9
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

37
winit/src/proxy.rs
View file

@ -1,6 +1,6 @@
use crate::futures::futures::{
channel::mpsc,
stream,
select,
task::{Context, Poll},
Future, Sink, StreamExt,
};
@ -31,40 +31,33 @@ impl<Message: 'static> Proxy<Message> {
pub fn new(
raw: winit::event_loop::EventLoopProxy<Message>,
) -> (Self, impl Future<Output = ()>) {
let (notifier, processed) = mpsc::channel(Self::MAX_SIZE);
let (sender, receiver) = mpsc::channel(Self::MAX_SIZE);
let (notifier, mut processed) = mpsc::channel(Self::MAX_SIZE);
let (sender, mut receiver) = mpsc::channel(Self::MAX_SIZE);
let proxy = raw.clone();
let worker = async move {
enum Item<T> {
MessageProduced(T),
BatchProcessed(usize),
}
let mut receiver = receiver.map(Item::MessageProduced);
let mut processed = processed.map(Item::BatchProcessed);
let mut count = 0;
loop {
if count < Self::MAX_SIZE {
let mut stream =
stream::select(receiver.by_ref(), processed.by_ref());
match stream.select_next_some().await {
Item::MessageProduced(message) => {
select! {
message = receiver.select_next_some() => {
let _ = proxy.send_event(message);
count += 1;
}
Item::BatchProcessed(amount) => {
amount = processed.select_next_some() => {
count = count.saturating_sub(amount);
}
complete => break,
}
} else {
select! {
amount = processed.select_next_some() => {
count = count.saturating_sub(amount);
}
complete => break,
}
} else if let Item::BatchProcessed(amount) =
processed.select_next_some().await
{
count = count.saturating_sub(amount);
}
}
};