From e1d8983bb6b2e88d29c294815600e72304e5c7a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Sun, 2 Aug 2020 10:41:07 +0200 Subject: [PATCH] aquatic http load test: clean up, minor reformatting --- aquatic_http_load_test/src/network.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/aquatic_http_load_test/src/network.rs b/aquatic_http_load_test/src/network.rs index 747d3b6..0e30e8b 100644 --- a/aquatic_http_load_test/src/network.rs +++ b/aquatic_http_load_test/src/network.rs @@ -142,7 +142,7 @@ impl Connection { let position = request_buffer.position() as usize; match self.send_request_inner(state, &request_buffer.get_mut()[..position]){ - Ok(_) => { + Ok(()) => { state.statistics.requests.fetch_add(1, Ordering::SeqCst); self.can_send = false; @@ -224,7 +224,6 @@ pub fn run_socket_thread( connections.remove(&token.0); num_to_create += 1; } - } else { eprintln!("connection not found: {:?}", token); } @@ -255,17 +254,15 @@ pub fn run_socket_thread( num_to_create += 1; } - let num_new = num_to_create.min(max_new); - - for _ in 0..num_new { - let err = Connection::create_and_register( + for _ in 0..num_to_create.min(max_new){ + let ok = Connection::create_and_register( config, &mut connections, &mut poll, &mut token_counter, - ).is_err(); + ).is_ok(); - if !err { + if ok { num_to_create -= 1; } }