From 0d3c6111ca39562d0d0a95e6a36b0963340f66c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Thu, 13 Jan 2022 19:21:53 +0100 Subject: [PATCH] udp: run cargo fmt --- aquatic_udp/src/workers/socket.rs | 37 ++++++--------------- aquatic_udp/src/workers/statistics.rs | 46 +++++++++++++++++++++------ 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/aquatic_udp/src/workers/socket.rs b/aquatic_udp/src/workers/socket.rs index 5b2f07c..130e11b 100644 --- a/aquatic_udp/src/workers/socket.rs +++ b/aquatic_udp/src/workers/socket.rs @@ -58,9 +58,7 @@ pub struct PendingScrapeResponseSlabEntry { } #[derive(Default)] -pub struct PendingScrapeResponseSlab( - Slab, -); +pub struct PendingScrapeResponseSlab(Slab); impl PendingScrapeResponseSlab { pub fn prepare_split_requests( @@ -459,14 +457,7 @@ fn send_responses( local_responses: Drain<(Response, SocketAddr)>, ) { for (response, addr) in local_responses { - send_response( - state, - config, - socket, - buffer, - response, - addr, - ); + send_response(state, config, socket, buffer, response, addr); } for (response, addr) in response_receiver.try_iter() { @@ -477,14 +468,7 @@ fn send_responses( }; if let Some(response) = opt_response { - send_response( - state, - config, - socket, - buffer, - response, - addr, - ); + send_response(state, config, socket, buffer, response, addr); } } } @@ -535,9 +519,11 @@ fn send_response( match response { Response::Connect(_) => { stats.responses_sent_connect.fetch_add(1, Ordering::Relaxed); - }, + } Response::AnnounceIpv4(_) | Response::AnnounceIpv6(_) => { - stats.responses_sent_announce.fetch_add(1, Ordering::Relaxed); + stats + .responses_sent_announce + .fetch_add(1, Ordering::Relaxed); } Response::Scrape(_) => { stats.responses_sent_scrape.fetch_add(1, Ordering::Relaxed); @@ -547,7 +533,7 @@ fn send_response( } } } - Ok(_) => {}, + Ok(_) => {} Err(err) => { ::log::info!("send_to error: {}", err); } @@ -647,11 +633,8 @@ mod tests { let mut all_split_requests = Vec::new(); for request in requests.iter() { - let split_requests = map.prepare_split_requests( - &config, - request.to_owned(), - valid_until, - ); + let split_requests = + map.prepare_split_requests(&config, request.to_owned(), valid_until); all_split_requests.push( split_requests diff --git a/aquatic_udp/src/workers/statistics.rs b/aquatic_udp/src/workers/statistics.rs index fccff7a..4477662 100644 --- a/aquatic_udp/src/workers/statistics.rs +++ b/aquatic_udp/src/workers/statistics.rs @@ -37,10 +37,18 @@ struct CollectedStatistics { impl CollectedStatistics { fn from_shared(statistics: &Arc, last: &mut Instant) -> Self { let requests_received = statistics.requests_received.fetch_and(0, Ordering::Relaxed) as f64; - let responses_sent_connect = statistics.responses_sent_connect.fetch_and(0, Ordering::Relaxed) as f64; - let responses_sent_announce = statistics.responses_sent_announce.fetch_and(0, Ordering::Relaxed) as f64; - let responses_sent_scrape = statistics.responses_sent_scrape.fetch_and(0, Ordering::Relaxed) as f64; - let responses_sent_error = statistics.responses_sent_error.fetch_and(0, Ordering::Relaxed) as f64; + let responses_sent_connect = statistics + .responses_sent_connect + .fetch_and(0, Ordering::Relaxed) as f64; + let responses_sent_announce = statistics + .responses_sent_announce + .fetch_and(0, Ordering::Relaxed) as f64; + let responses_sent_scrape = statistics + .responses_sent_scrape + .fetch_and(0, Ordering::Relaxed) as f64; + let responses_sent_error = statistics + .responses_sent_error + .fetch_and(0, Ordering::Relaxed) as f64; let bytes_received = statistics.bytes_received.fetch_and(0, Ordering::Relaxed) as f64; let bytes_sent = statistics.bytes_sent.fetch_and(0, Ordering::Relaxed) as f64; let num_torrents = Self::sum_atomic_usizes(&statistics.torrents); @@ -75,7 +83,10 @@ impl Into for CollectedStatistics { let rx_mbits = self.bytes_received_per_second * 8.0 / 1_000_000.0; let tx_mbits = self.bytes_sent_per_second * 8.0 / 1_000_000.0; - let responses_per_second_total = self.responses_per_second_connect + self.responses_per_second_announce + self.responses_per_second_scrape + self.responses_per_second_error; + let responses_per_second_total = self.responses_per_second_connect + + self.responses_per_second_announce + + self.responses_per_second_scrape + + self.responses_per_second_error; FormattedStatistics { requests_per_second: (self.requests_per_second as usize) @@ -186,11 +197,26 @@ pub fn run_statistics_worker(config: Config, state: State) { fn print_to_stdout(config: &Config, statistics: &FormattedStatistics) { println!(" requests/second: {:>10}", statistics.requests_per_second); println!(" responses/second"); - println!(" total: {:>10}", statistics.responses_per_second_total); - println!(" connect: {:>10}", statistics.responses_per_second_connect); - println!(" announce: {:>10}", statistics.responses_per_second_announce); - println!(" scrape: {:>10}", statistics.responses_per_second_scrape); - println!(" error: {:>10}", statistics.responses_per_second_error); + println!( + " total: {:>10}", + statistics.responses_per_second_total + ); + println!( + " connect: {:>10}", + statistics.responses_per_second_connect + ); + println!( + " announce: {:>10}", + statistics.responses_per_second_announce + ); + println!( + " scrape: {:>10}", + statistics.responses_per_second_scrape + ); + println!( + " error: {:>10}", + statistics.responses_per_second_error + ); println!( " bandwidth: {:>7} Mbit/s in, {:7} Mbit/s out", statistics.rx_mbits, statistics.tx_mbits,