run cargo fmt

This commit is contained in:
Joakim Frostegård 2021-11-17 00:52:19 +01:00
parent 5440157a95
commit c5bf3901ea
2 changed files with 22 additions and 19 deletions

View file

@ -316,8 +316,7 @@ pub fn run_socket_worker(
let num_to_queue = (space_in_send_queue).min(local_responses.len()); let num_to_queue = (space_in_send_queue).min(local_responses.len());
let drain_from_index = local_responses.len() - num_to_queue; let drain_from_index = local_responses.len() - num_to_queue;
for (response, addr) in local_responses.drain(drain_from_index..) for (response, addr) in local_responses.drain(drain_from_index..) {
{
queue_response( queue_response(
&config, &config,
&mut sq, &mut sq,

View file

@ -1,16 +1,16 @@
use std::{io::Cursor, vec::Drain};
use std::net::SocketAddr; use std::net::SocketAddr;
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
use std::time::Duration; use std::time::Duration;
use std::{io::Cursor, vec::Drain};
use mio::{net::UdpSocket, Events, Interest, Poll, Token}; use mio::{net::UdpSocket, Events, Interest, Poll, Token};
use rand::{SeedableRng, prelude::SmallRng, thread_rng}; use rand::{prelude::SmallRng, thread_rng, SeedableRng};
use rand_distr::Pareto; use rand_distr::Pareto;
use socket2::{Domain, Protocol, Socket, Type}; use socket2::{Domain, Protocol, Socket, Type};
use aquatic_udp_protocol::*; use aquatic_udp_protocol::*;
use crate::{common::*, handler::{process_response}, utils::*}; use crate::{common::*, handler::process_response, utils::*};
const MAX_PACKET_SIZE: usize = 4096; const MAX_PACKET_SIZE: usize = 4096;
@ -76,7 +76,9 @@ pub fn run_worker_thread(
let mut requests = Vec::new(); let mut requests = Vec::new();
// Bootstrap request cycle by adding a request // Bootstrap request cycle by adding a request
requests.push(create_connect_request(generate_transaction_id(&mut thread_rng()))); requests.push(create_connect_request(generate_transaction_id(
&mut thread_rng(),
)));
loop { loop {
poll.poll(&mut events, Some(timeout)) poll.poll(&mut events, Some(timeout))
@ -84,16 +86,12 @@ pub fn run_worker_thread(
for event in events.iter() { for event in events.iter() {
if (event.token() == token) & event.is_readable() { if (event.token() == token) & event.is_readable() {
read_responses( read_responses(&socket, &mut buffer, &mut local_state, &mut responses);
&socket,
&mut buffer,
&mut local_state,
&mut responses,
);
} }
} }
let total_responses = responses.len() + if thread_id.0 == 0 { let total_responses = responses.len()
+ if thread_id.0 == 0 {
state.responses.fetch_and(0, Ordering::SeqCst) state.responses.fetch_and(0, Ordering::SeqCst)
} else { } else {
state.responses.fetch_add(responses.len(), Ordering::SeqCst) state.responses.fetch_add(responses.len(), Ordering::SeqCst)
@ -112,8 +110,14 @@ pub fn run_worker_thread(
} }
for response in responses.drain(..) { for response in responses.drain(..) {
let opt_request = let opt_request = process_response(
process_response(&mut rng, pareto, &state.info_hashes, &config, &mut torrent_peers, response); &mut rng,
pareto,
&state.info_hashes,
&config,
&mut torrent_peers,
response,
);
if let Some(new_request) = opt_request { if let Some(new_request) = opt_request {
requests.push(new_request); requests.push(new_request);