Miroirs/pinnacle
1
0
Fork 0
mirror of https://github.com/pinnacle-comp/pinnacle.git synced 2024-12-25 09:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix deadlock again (maybe)

Browse source 
This took like 4 hours to figure out, async sucks wtf
This commit is contained in:
Ottatop 2024-02-23 16:17:22 -06:00
parent a70e686bdf
commit 01a9874ecd
4 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/rust/src/input.rs
View file

@ -177,6 +177,7 @@ impl Input {
while let Some(Ok(_response)) = stream.next().await {
action();
tokio::task::yield_now().await;
}
}
.boxed(),
@ -232,6 +233,7 @@ impl Input {
while let Some(Ok(_response)) = stream.next().await {
action();
tokio::task::yield_now().await;
}
}
.boxed(),

40
api/rust/src/lib.rs
View file

@ -82,8 +82,10 @@
use std::sync::OnceLock;
use futures::{
channel::mpsc::UnboundedReceiver, future::BoxFuture, stream::FuturesUnordered, Future,
StreamExt,
channel::mpsc::UnboundedReceiver,
future::{BoxFuture, Either},
stream::FuturesUnordered,
Future, StreamExt,
};
use input::Input;
use output::Output;
@ -175,31 +177,17 @@ pub async fn connect(
///
/// This function is inserted at the end of your config through the [`config`] macro.
/// You should use the macro instead of this function directly.
pub async fn listen(fut_recv: UnboundedReceiver<BoxFuture<'static, ()>>) {
let mut future_set = FuturesUnordered::<
BoxFuture<(
Option<BoxFuture<()>>,
Option<UnboundedReceiver<BoxFuture<()>>>,
)>,
>::new();
pub async fn listen(mut fut_recv: UnboundedReceiver<BoxFuture<'static, ()>>) {
let mut future_set = FuturesUnordered::<BoxFuture<()>>::new();
future_set.push(Box::pin(async move {
let (fut, stream) = fut_recv.into_future().await;
(fut, Some(stream))
}));
while let Some((fut, stream)) = future_set.next().await {
if let Some(fut) = fut {
future_set.push(Box::pin(async move {
fut.await;
(None, None)
}));
}
if let Some(stream) = stream {
future_set.push(Box::pin(async move {
let (fut, stream) = stream.into_future().await;
(fut, Some(stream))
}))
loop {
match futures::future::select(fut_recv.next(), future_set.next()).await {
Either::Left((fut, _)) => {
if let Some(fut) = fut {
future_set.push(fut);
}
}
Either::Right(_) => (),
}
}
}

1
api/rust/src/output.rs
View file

@ -166,6 +166,7 @@ impl Output {
};
for_all(output);
tokio::task::yield_now().await;
}
}
.boxed(),

1
api/rust/src/process.rs
View file

@ -153,6 +153,7 @@ impl Process {
exit(response.exit_code, exit_msg);
}
}
tokio::task::yield_now().await;
}
}
.boxed(),