YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_udp: use StreamExt::or when receiving from channels

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-19 02:03:23 +02:00
parent c6ba1bc61c
commit 93907822f8
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aquatic_udp/src/lib/glommio/handlers.rs
View file

@ -30,7 +30,7 @@ pub async fn run_request_worker(
let mut stream = empty().boxed_local();
for (_, receiver) in request_receivers.streams() {
stream = Box::pin(stream.race(receiver));
stream = Box::pin(stream.or(receiver));
}
while let Some((producer_index, request, addr)) = stream.next().await {

4
aquatic_udp/src/lib/glommio/network.rs
View file

@ -68,7 +68,9 @@ async fn read_requests(
let valid_until = ValidUntil::new(config.cleaning.max_connection_age);
let access_list_mode = config.access_list.mode;
// Needs to be updated periodically: use timer?
let access_list = AccessList::default();
// Needs to be cleaned periodically: use timer?
let mut connections = ConnectionMap::default();
let mut buf = [0u8; 2048];
@ -164,7 +166,7 @@ async fn send_responses(
let mut stream = local_receiver.stream().boxed_local();
for (_, receiver) in response_receivers.streams().into_iter() {
stream = Box::pin(stream.race(receiver.map(|(response, addr)| (response.into(), addr))));
stream = Box::pin(stream.or(receiver.map(|(response, addr)| (response.into(), addr))));
}
while let Some((response, src)) = stream.next().await {