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 glommio: detach tasks, await them later; add debug logging

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-20 02:06:51 +02:00
parent 2cc357f2f2
commit 047d138b2b
4 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,13 +39,21 @@ pub async fn run_request_worker(
})()
}));
let mut handles = Vec::new();
for (_, receiver) in request_receivers.streams() {
spawn_local(handle_request_stream(
let handle = spawn_local(handle_request_stream(
config.clone(),
torrents.clone(),
response_senders.clone(),
receiver,
)).await;
)).detach();
handles.push(handle);
}
for handle in handles {
handle.await;
}
}
@ -82,6 +90,8 @@ async fn handle_request_stream<S>(
),
};
::log::debug!("preparing to send response to channel: {:?}", response);
if let Err(err) = response_senders.try_send_to(producer_index, (response, addr)) {
::log::warn!("response_sender.try_send: {:?}", err);
}

6
aquatic_udp/src/lib/glommio/mod.rs
View file

@ -9,11 +9,13 @@ mod common;
pub mod handlers;
pub mod network;
pub const SHARED_CHANNEL_SIZE: usize = 4096;
pub fn run(config: Config) -> anyhow::Result<()> {
let num_peers = config.socket_workers + config.request_workers;
let request_mesh_builder = MeshBuilder::partial(num_peers, 1024);
let response_mesh_builder = MeshBuilder::partial(num_peers, 1024);
let request_mesh_builder = MeshBuilder::partial(num_peers, SHARED_CHANNEL_SIZE);
let response_mesh_builder = MeshBuilder::partial(num_peers, SHARED_CHANNEL_SIZE);
let num_bound_sockets = Arc::new(AtomicUsize::new(0));

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

@ -51,15 +51,13 @@ pub async fn run_socket_worker(
response_consumer_index,
local_sender,
socket.clone(),
))
.await;
)).detach();
for (_, receiver) in response_receivers.streams().into_iter() {
spawn_local(send_responses(
socket.clone(),
receiver.map(|(response, addr)| (response.into(), addr)),
))
.await;
)).detach();
}
send_responses(socket, local_receiver.stream()).await;
@ -90,6 +88,8 @@ async fn read_requests(
Ok((amt, src)) => {
let request = Request::from_bytes(&buf[..amt], config.protocol.max_scrape_torrents);
::log::debug!("read request: {:?}", request);
match request {
Ok(Request::Connect(request)) => {
let connection_id = ConnectionId(rng.gen());
@ -101,7 +101,7 @@ async fn read_requests(
transaction_id: request.transaction_id,
});
local_sender.try_send((response, src));
local_sender.try_send((response, src)).unwrap();
}
Ok(Request::Announce(request)) => {
if connections.contains(request.connection_id, src) {
@ -121,7 +121,7 @@ async fn read_requests(
message: "Info hash not allowed".into(),
});
local_sender.try_send((response, src));
local_sender.try_send((response, src)).unwrap();
}
}
}
@ -132,7 +132,7 @@ async fn read_requests(
message: "Scrape requests not supported".into(),
});
local_sender.try_send((response, src));
local_sender.try_send((response, src)).unwrap();
}
}
Err(err) => {
@ -150,7 +150,7 @@ async fn read_requests(
message: err.right_or("Parse error").into(),
};
local_sender.try_send((response.into(), src));
local_sender.try_send((response.into(), src)).unwrap();
}
}
}
@ -174,6 +174,8 @@ where
while let Some((response, src)) = stream.next().await {
buf.set_position(0);
::log::debug!("preparing to send response: {:?}", response.clone());
response
.write(&mut buf, ip_version_from_ip(src.ip()))

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

@ -12,7 +12,7 @@ use config::Config;
pub const APP_NAME: &str = "aquatic_udp: UDP BitTorrent tracker";
pub fn run(config: Config) -> ::anyhow::Result<()> {
mio::run(config)
glommio::run(config)
}
pub fn update_access_list(config: &Config, access_list: &Arc<AccessListArcSwap>) {