YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 18:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix more clippy warnings

Browse source
This commit is contained in:
Joakim Frostegård 2020-08-02 00:36:56 +02:00
parent aabdf76a5d
commit 561cc3db55
16 changed files with 83 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

27
aquatic_udp_bench/src/announce.rs
View file

@ -20,7 +20,7 @@ pub fn bench_announce_handler(
request_sender: &Sender<(Request, SocketAddr)>,
response_receiver: &Receiver<(Response, SocketAddr)>,
rng: &mut impl Rng,
info_hashes: &Vec<InfoHash>,
info_hashes: &[InfoHash],
) -> (usize, Duration) {
let requests = create_requests(
state,
@ -58,15 +58,12 @@ pub fn bench_announce_handler(
let total = bench_config.num_announce_requests * (round + 1);
while num_responses < total {
match response_receiver.recv(){
Ok((Response::Announce(r), _)) => {
num_responses += 1;
if let Ok((Response::Announce(r), _)) = response_receiver.recv() {
num_responses += 1;
if let Some(last_peer) = r.peers.last(){
dummy ^= last_peer.port.0;
}
},
_ => {}
if let Some(last_peer) = r.peers.last(){
dummy ^= last_peer.port.0;
}
}
}
}
@ -84,7 +81,7 @@ pub fn bench_announce_handler(
pub fn create_requests(
state: &State,
rng: &mut impl Rng,
info_hashes: &Vec<InfoHash>,
info_hashes: &[InfoHash],
number: usize,
) -> Vec<(AnnounceRequest, SocketAddr)> {
let pareto = Pareto::new(1., PARETO_SHAPE).unwrap();
@ -100,15 +97,11 @@ pub fn create_requests(
.cloned()
.collect();
for i in 0..number {
for connection_key in connection_keys.into_iter(){
let info_hash_index = pareto_usize(rng, pareto, max_index);
// Will panic if less connection requests than announce requests
let connection_id = connection_keys[i].connection_id;
let src = connection_keys[i].socket_addr;
let request = AnnounceRequest {
connection_id,
connection_id: connection_key.connection_id,
transaction_id: TransactionId(rng.gen()),
info_hash: info_hashes[info_hash_index],
peer_id: PeerId(rng.gen()),
@ -122,7 +115,7 @@ pub fn create_requests(
port: Port(rng.gen())
};
requests.push((request, src));
requests.push((request, connection_key.socket_addr));
}
requests

9
aquatic_udp_bench/src/connect.rs
View file

@ -48,12 +48,9 @@ pub fn bench_connect_handler(
let total = bench_config.num_connect_requests * (round + 1);
while num_responses < total {
match response_receiver.recv(){
Ok((Response::Connect(r), _)) => {
num_responses += 1;
dummy ^= r.connection_id.0;
},
_ => {}
if let Ok((Response::Connect(r), _)) = response_receiver.recv(){
num_responses += 1;
dummy ^= r.connection_id.0;
}
}
}

2
aquatic_udp_bench/src/main.rs
View file

@ -48,7 +48,7 @@ fn main(){
pub fn run(bench_config: BenchConfig) -> ::anyhow::Result<()> {
// Setup common state, spawn request handlers
let state = State::new();
let state = State::default();
let aquatic_config = Config::default();
let (request_sender, request_receiver) = unbounded();

27
aquatic_udp_bench/src/scrape.rs
View file

@ -20,7 +20,7 @@ pub fn bench_scrape_handler(
request_sender: &Sender<(Request, SocketAddr)>,
response_receiver: &Receiver<(Response, SocketAddr)>,
rng: &mut impl Rng,
info_hashes: &Vec<InfoHash>,
info_hashes: &[InfoHash],
) -> (usize, Duration) {
let requests = create_requests(
state,
@ -59,15 +59,12 @@ pub fn bench_scrape_handler(
let total = bench_config.num_scrape_requests * (round + 1);
while num_responses < total {
match response_receiver.recv(){
Ok((Response::Scrape(r), _)) => {
num_responses += 1;
if let Ok((Response::Scrape(r), _)) = response_receiver.recv(){
num_responses += 1;
if let Some(stat) = r.torrent_stats.last(){
dummy ^= stat.leechers.0;
}
},
_ => {}
if let Some(stat) = r.torrent_stats.last(){
dummy ^= stat.leechers.0;
}
}
}
}
@ -86,7 +83,7 @@ pub fn bench_scrape_handler(
pub fn create_requests(
state: &State,
rng: &mut impl Rng,
info_hashes: &Vec<InfoHash>,
info_hashes: &[InfoHash],
number: usize,
hashes_per_request: usize,
) -> Vec<(ScrapeRequest, SocketAddr)> {
@ -103,7 +100,7 @@ pub fn create_requests(
let mut requests = Vec::new();
for i in 0..number {
for connection_key in connection_keys.into_iter(){
let mut request_info_hashes = Vec::new();
for _ in 0..hashes_per_request {
@ -111,17 +108,13 @@ pub fn create_requests(
request_info_hashes.push(info_hashes[info_hash_index])
}
// Will panic if less connection requests than scrape requests
let connection_id = connection_keys[i].connection_id;
let src = connection_keys[i].socket_addr;
let request = ScrapeRequest {
connection_id,
connection_id: connection_key.connection_id,
transaction_id: TransactionId(rng.gen()),
info_hashes: request_info_hashes,
};
requests.push((request, src));
requests.push((request, connection_key.socket_addr));
}
requests