mirror of
https://github.com/YGGverse/aquatic.git
synced 2026-04-02 18:55:32 +00:00
aquatic_udp: use mesh in glommio version
This commit is contained in:
parent
f28808b30c
commit
4a8651e1c6
6 changed files with 100 additions and 43 deletions
|
|
@ -1,23 +1,26 @@
|
|||
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
|
||||
|
||||
use futures_lite::stream::empty;
|
||||
use futures_lite::StreamExt;
|
||||
use glommio::channels::channel_mesh::{MeshBuilder, Partial, Role};
|
||||
use glommio::prelude::*;
|
||||
use glommio::channels::shared_channel::{SharedReceiver, SharedSender};
|
||||
use rand::SeedableRng;
|
||||
use rand::prelude::SmallRng;
|
||||
use rand::SeedableRng;
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::common::*;
|
||||
use crate::common::announce::handle_announce_request;
|
||||
use crate::common::*;
|
||||
use crate::config::Config;
|
||||
|
||||
pub fn run_request_worker(
|
||||
config: Config,
|
||||
request_receiver: SharedReceiver<(AnnounceRequest, SocketAddr)>,
|
||||
response_sender: SharedSender<(AnnounceResponse, SocketAddr)>,
|
||||
request_mesh_builder: MeshBuilder<(usize, AnnounceRequest, SocketAddr), Partial>,
|
||||
response_mesh_builder: MeshBuilder<(AnnounceResponse, SocketAddr), Partial>,
|
||||
) {
|
||||
LocalExecutorBuilder::default()
|
||||
.spawn(|| async move {
|
||||
let request_receiver = request_receiver.connect().await;
|
||||
let response_sender = response_sender.connect().await;
|
||||
let (_, mut request_receivers) =
|
||||
request_mesh_builder.join(Role::Consumer).await.unwrap();
|
||||
let (response_senders, _) = response_mesh_builder.join(Role::Producer).await.unwrap();
|
||||
|
||||
let mut rng = SmallRng::from_entropy();
|
||||
|
||||
|
|
@ -28,23 +31,38 @@ pub fn run_request_worker(
|
|||
// Needs to be updated periodically: use timer?
|
||||
let peer_valid_until = ValidUntil::new(config.cleaning.max_peer_age);
|
||||
|
||||
while let Some((request, addr)) = request_receiver.recv().await {
|
||||
let mut stream = empty().boxed_local();
|
||||
|
||||
for (_, receiver) in request_receivers.streams() {
|
||||
stream = Box::pin(stream.race(receiver));
|
||||
}
|
||||
|
||||
while let Some((producer_index, request, addr)) = stream.next().await {
|
||||
let response = match addr.ip() {
|
||||
IpAddr::V4(ip) => {
|
||||
handle_announce_request(&config, &mut rng, &mut torrents_ipv4, request, ip, peer_valid_until)
|
||||
},
|
||||
IpAddr::V6(ip) => {
|
||||
handle_announce_request(&config, &mut rng, &mut torrents_ipv6, request, ip, peer_valid_until)
|
||||
},
|
||||
IpAddr::V4(ip) => handle_announce_request(
|
||||
&config,
|
||||
&mut rng,
|
||||
&mut torrents_ipv4,
|
||||
request,
|
||||
ip,
|
||||
peer_valid_until,
|
||||
),
|
||||
IpAddr::V6(ip) => handle_announce_request(
|
||||
&config,
|
||||
&mut rng,
|
||||
&mut torrents_ipv6,
|
||||
request,
|
||||
ip,
|
||||
peer_valid_until,
|
||||
),
|
||||
};
|
||||
|
||||
if let Err(err) = response_sender.try_send((response, addr)) {
|
||||
if let Err(err) = response_senders.try_send_to(producer_index, (response, addr)) {
|
||||
::log::warn!("response_sender.try_send: {:?}", err);
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
.expect("failed to spawn local executor")
|
||||
.join()
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue