Run rustfmt, clean up aquatic_http_protocol/Cargo.toml

aquatic_http_load_test/src/main.rs

@@ -1,5 +1,5 @@
+use std::sync::{atomic::Ordering, Arc};
 use std::thread;
-use std::sync::{Arc, atomic::Ordering};
 use std::time::{Duration, Instant};
 
 use rand::prelude::*;
@@ -14,31 +14,27 @@ use common::*;
 use config::*;
 use network::*;
 
-
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-
 /// Multiply bytes during a second with this to get Mbit/s
 const MBITS_FACTOR: f64 = 1.0 / ((1024.0 * 1024.0) / 8.0);
 
-
-pub fn main(){
+pub fn main() {
     aquatic_cli_helpers::run_app_with_cli_and_config::<Config>(
         "aquatic_http_load_test: BitTorrent load tester",
         run,
-        None
+        None,
     )
 }
 
-
 fn run(config: Config) -> ::anyhow::Result<()> {
     if config.torrents.weight_announce + config.torrents.weight_scrape == 0 {
         panic!("Error: at least one weight must be larger than zero.");
     }
 
     println!("Starting client with config: {:#?}", config);
-    
+
     let mut info_hashes = Vec::with_capacity(config.torrents.number_of_torrents);
 
     let mut rng = SmallRng::from_entropy();
@@ -47,10 +43,7 @@ fn run(config: Config) -> ::anyhow::Result<()> {
         info_hashes.push(InfoHash(rng.gen()));
     }
 
-    let pareto = Pareto::new(
-        1.0,
-        config.torrents.torrent_selection_pareto_shape
-    ).unwrap();
+    let pareto = Pareto::new(1.0, config.torrents.torrent_selection_pareto_shape).unwrap();
 
     let state = LoadTestState {
         info_hashes: Arc::new(info_hashes),
@@ -61,30 +54,18 @@ fn run(config: Config) -> ::anyhow::Result<()> {
     // Start socket workers
 
     for _ in 0..config.num_workers {
-
         let config = config.clone();
         let state = state.clone();
 
-        thread::spawn(move || run_socket_thread(
-            &config,
-            state,
-            1
-        ));
+        thread::spawn(move || run_socket_thread(&config, state, 1));
     }
 
-    monitor_statistics(
-        state,
-        &config
-    );
+    monitor_statistics(state, &config);
 
     Ok(())
 }
 
-
-fn monitor_statistics(
-    state: LoadTestState,
-    config: &Config,
-){
+fn monitor_statistics(state: LoadTestState, config: &Config) {
     let start_time = Instant::now();
     let mut report_avg_response_vec: Vec<f64> = Vec::new();
 
@@ -96,42 +77,53 @@ fn monitor_statistics(
 
         let statistics = state.statistics.as_ref();
 
-        let responses_announce = statistics.responses_announce
-            .fetch_and(0, Ordering::SeqCst) as f64;
+        let responses_announce =
+            statistics.responses_announce.fetch_and(0, Ordering::SeqCst) as f64;
         // let response_peers = statistics.response_peers
         //     .fetch_and(0, Ordering::SeqCst) as f64;
 
-        let requests_per_second = statistics.requests
-            .fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
-        let responses_scrape_per_second = statistics.responses_scrape
-            .fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
-        let responses_failure_per_second = statistics.responses_failure
-            .fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
+        let requests_per_second =
+            statistics.requests.fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
+        let responses_scrape_per_second =
+            statistics.responses_scrape.fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
+        let responses_failure_per_second =
+            statistics.responses_failure.fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
 
-        let bytes_sent_per_second = statistics.bytes_sent
-            .fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
-        let bytes_received_per_second = statistics.bytes_received
-            .fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
+        let bytes_sent_per_second =
+            statistics.bytes_sent.fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
+        let bytes_received_per_second =
+            statistics.bytes_received.fetch_and(0, Ordering::SeqCst) as f64 / interval_f64;
 
-        let responses_announce_per_second =  responses_announce / interval_f64;
+        let responses_announce_per_second = responses_announce / interval_f64;
 
-        let responses_per_second = 
-            responses_announce_per_second +
-            responses_scrape_per_second +
-            responses_failure_per_second;
+        let responses_per_second = responses_announce_per_second
+            + responses_scrape_per_second
+            + responses_failure_per_second;
 
         report_avg_response_vec.push(responses_per_second);
 
         println!();
         println!("Requests out: {:.2}/second", requests_per_second);
         println!("Responses in: {:.2}/second", responses_per_second);
-        println!("  - Announce responses: {:.2}", responses_announce_per_second);
+        println!(
+            "  - Announce responses: {:.2}",
+            responses_announce_per_second
+        );
         println!("  - Scrape responses:   {:.2}", responses_scrape_per_second);
-        println!("  - Failure responses:  {:.2}", responses_failure_per_second);
+        println!(
+            "  - Failure responses:  {:.2}",
+            responses_failure_per_second
+        );
         //println!("Peers per announce response: {:.2}", response_peers / responses_announce);
-        println!("Bandwidth out: {:.2}Mbit/s", bytes_sent_per_second * MBITS_FACTOR);
-        println!("Bandwidth in:  {:.2}Mbit/s", bytes_received_per_second * MBITS_FACTOR);
-        
+        println!(
+            "Bandwidth out: {:.2}Mbit/s",
+            bytes_sent_per_second * MBITS_FACTOR
+        );
+        println!(
+            "Bandwidth in:  {:.2}Mbit/s",
+            bytes_received_per_second * MBITS_FACTOR
+        );
+
         let time_elapsed = start_time.elapsed();
         let duration = Duration::from_secs(config.duration as u64);
 
@@ -151,7 +143,7 @@ fn monitor_statistics(
                 config
             );
 
-            break
+            break;
         }
     }
 }