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

Run cargo fmt

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-23 12:42:56 +02:00
parent aaa609b5f0
commit 072f064138
4 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
//! Work-in-progress glommio (io_uring) implementation //! Work-in-progress glommio (io_uring) implementation
//! //!
//! * Doesn't support scrape requests //! * Doesn't support scrape requests
//! * Currently not faster than mio implementation //! * Currently not faster than mio implementation
@ -18,9 +18,9 @@ pub const SHARED_CHANNEL_SIZE: usize = 4096;
pub fn run(config: Config) -> anyhow::Result<()> { pub fn run(config: Config) -> anyhow::Result<()> {
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
core_affinity::set_for_current( core_affinity::set_for_current(core_affinity::CoreId {
core_affinity::CoreId { id: config.core_affinity.offset } id: config.core_affinity.offset,
); });
} }
let num_peers = config.socket_workers + config.request_workers; let num_peers = config.socket_workers + config.request_workers;
@ -65,7 +65,8 @@ pub fn run(config: Config) -> anyhow::Result<()> {
let mut builder = LocalExecutorBuilder::default(); let mut builder = LocalExecutorBuilder::default();
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
builder = builder.pin_to_cpu(config.core_affinity.offset + 1 + config.socket_workers + i); builder =
builder.pin_to_cpu(config.core_affinity.offset + 1 + config.socket_workers + i);
} }
let executor = builder.spawn(|| async move { let executor = builder.spawn(|| async move {

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

@ -9,9 +9,9 @@ use std::sync::{
use std::time::Duration; use std::time::Duration;
use futures_lite::{Stream, StreamExt}; use futures_lite::{Stream, StreamExt};
use glommio::enclose;
use glommio::channels::channel_mesh::{MeshBuilder, Partial, Role, Senders}; use glommio::channels::channel_mesh::{MeshBuilder, Partial, Role, Senders};
use glommio::channels::local_channel::{new_unbounded, LocalSender}; use glommio::channels::local_channel::{new_unbounded, LocalSender};
use glommio::enclose;
use glommio::net::UdpSocket; use glommio::net::UdpSocket;
use glommio::prelude::*; use glommio::prelude::*;
use glommio::timer::TimerActionRepeat; use glommio::timer::TimerActionRepeat;
@ -127,7 +127,11 @@ async fn read_requests(
Ok(Request::Connect(request)) => { Ok(Request::Connect(request)) => {
let connection_id = ConnectionId(rng.gen()); let connection_id = ConnectionId(rng.gen());
connections.borrow_mut().insert(connection_id, src, connection_valid_until.borrow().to_owned()); connections.borrow_mut().insert(
connection_id,
src,
connection_valid_until.borrow().to_owned(),
);
let response = Response::Connect(ConnectResponse { let response = Response::Connect(ConnectResponse {
connection_id, connection_id,
@ -138,7 +142,10 @@ async fn read_requests(
} }
Ok(Request::Announce(request)) => { Ok(Request::Announce(request)) => {
if connections.borrow().contains(request.connection_id, src) { if connections.borrow().contains(request.connection_id, src) {
if access_list.borrow().allows(access_list_mode, &request.info_hash.0) { if access_list
.borrow()
.allows(access_list_mode, &request.info_hash.0)
{
let request_consumer_index = let request_consumer_index =
(request.info_hash.0[0] as usize) % config.request_workers; (request.info_hash.0[0] as usize) % config.request_workers;

24
aquatic_udp/src/lib/mio/mod.rs
View file

@ -25,9 +25,9 @@ use common::State;
pub fn run(config: Config) -> ::anyhow::Result<()> { pub fn run(config: Config) -> ::anyhow::Result<()> {
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
core_affinity::set_for_current( core_affinity::set_for_current(core_affinity::CoreId {
core_affinity::CoreId { id: config.core_affinity.offset } id: config.core_affinity.offset,
); });
} }
let state = State::default(); let state = State::default();
@ -93,9 +93,9 @@ pub fn start_workers(
.name(format!("request-{:02}", i + 1)) .name(format!("request-{:02}", i + 1))
.spawn(move || { .spawn(move || {
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
core_affinity::set_for_current( core_affinity::set_for_current(core_affinity::CoreId {
core_affinity::CoreId { id: config.core_affinity.offset + 1 + i } id: config.core_affinity.offset + 1 + i,
); });
} }
handlers::run_request_worker(state, config, request_receiver, response_sender) handlers::run_request_worker(state, config, request_receiver, response_sender)
@ -114,9 +114,9 @@ pub fn start_workers(
.name(format!("socket-{:02}", i + 1)) .name(format!("socket-{:02}", i + 1))
.spawn(move || { .spawn(move || {
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
core_affinity::set_for_current( core_affinity::set_for_current(core_affinity::CoreId {
core_affinity::CoreId { id: config.core_affinity.offset + 1 + config.request_workers + i } id: config.core_affinity.offset + 1 + config.request_workers + i,
); });
} }
network::run_socket_worker( network::run_socket_worker(
@ -139,9 +139,9 @@ pub fn start_workers(
.name("statistics-collector".to_string()) .name("statistics-collector".to_string())
.spawn(move || { .spawn(move || {
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
core_affinity::set_for_current( core_affinity::set_for_current(core_affinity::CoreId {
core_affinity::CoreId { id: config.core_affinity.offset } id: config.core_affinity.offset,
); });
} }
loop { loop {

21
aquatic_udp_load_test/src/main.rs
View file

@ -34,13 +34,12 @@ impl aquatic_cli_helpers::Config for Config {}
fn run(config: Config) -> ::anyhow::Result<()> { fn run(config: Config) -> ::anyhow::Result<()> {
let affinity_max = core_affinity::get_core_ids() let affinity_max = core_affinity::get_core_ids()
.map(|ids| ids.iter().map(|id| id.id ).max()) .map(|ids| ids.iter().map(|id| id.id).max())
.flatten().unwrap_or(0); .flatten()
.unwrap_or(0);
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
core_affinity::set_for_current( core_affinity::set_for_current(core_affinity::CoreId { id: affinity_max });
core_affinity::CoreId { id: affinity_max }
);
} }
if config.handler.weight_announce + config.handler.weight_connect + config.handler.weight_scrape if config.handler.weight_announce + config.handler.weight_connect + config.handler.weight_scrape
@ -103,9 +102,9 @@ fn run(config: Config) -> ::anyhow::Result<()> {
thread::spawn(move || { thread::spawn(move || {
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
core_affinity::set_for_current( core_affinity::set_for_current(core_affinity::CoreId {
core_affinity::CoreId { id: affinity_max - 1 - i as usize } id: affinity_max - 1 - i as usize,
); });
} }
run_socket_thread(state, response_sender, receiver, &config, addr, thread_id) run_socket_thread(state, response_sender, receiver, &config, addr, thread_id)
@ -120,9 +119,9 @@ fn run(config: Config) -> ::anyhow::Result<()> {
thread::spawn(move || { thread::spawn(move || {
if config.core_affinity.set_affinities { if config.core_affinity.set_affinities {
core_affinity::set_for_current( core_affinity::set_for_current(core_affinity::CoreId {
core_affinity::CoreId { id: affinity_max - config.num_socket_workers as usize - 1 - i as usize } id: affinity_max - config.num_socket_workers as usize - 1 - i as usize,
); });
} }
run_handler_thread(&config, state, pareto, request_senders, response_receiver) run_handler_thread(&config, state, pareto, request_senders, response_receiver)
}); });