allow flows to be u32

Author: usamasaqib

lading/src/blackhole/tcp_crr.rs

@@ -19,7 +19,7 @@
 //! `connections_closed`: Flow removals (client close + I/O errors)
 
 use std::net::{IpAddr, SocketAddr};
-use std::num::{NonZeroU16, NonZeroUsize};
+use std::num::{NonZeroU16, NonZeroU32, NonZeroUsize};
 
 use serde::{Deserialize, Serialize};
 
@@ -30,6 +30,10 @@ fn default_nonzero_u16() -> NonZeroU16 {
     NonZeroU16::new(1).expect("1 is nonzero")
 }
 
+fn default_nonzero_u32() -> NonZeroU32 {
+    NonZeroU32::new(1).expect("1 is nonzero")
+}
+
 fn default_nonzero_usize() -> NonZeroUsize {
     NonZeroUsize::new(1).expect("1 is nonzero")
 }
@@ -69,8 +73,8 @@ pub struct Config {
     /// Total number of TCP flows the generator should open (neper `-F`).
     /// Default 1. Sent to the generator over the control connection at
     /// startup; the generator does not configure this independently.
-    #[serde(default = "default_nonzero_u16")]
-    pub flows: NonZeroU16,
+    #[serde(default = "default_nonzero_u32")]
+    pub flows: NonZeroU32,
     /// Bytes to read per request. Default 1.
     #[serde(default = "default_nonzero_usize")]
     pub request_size: NonZeroUsize,

lading/src/blackhole/tcp_rr.rs

@@ -17,7 +17,7 @@
 //! `bytes_written`: Response bytes sent
 
 use std::net::{IpAddr, SocketAddr};
-use std::num::{NonZeroU16, NonZeroUsize};
+use std::num::{NonZeroU16, NonZeroU32, NonZeroUsize};
 
 use serde::{Deserialize, Serialize};
 
@@ -28,6 +28,10 @@ fn default_nonzero_u16() -> NonZeroU16 {
     NonZeroU16::new(1).expect("1 is nonzero")
 }
 
+fn default_nonzero_u32() -> NonZeroU32 {
+    NonZeroU32::new(1).expect("1 is nonzero")
+}
+
 fn default_nonzero_usize() -> NonZeroUsize {
     NonZeroUsize::new(1).expect("1 is nonzero")
 }
@@ -67,8 +71,8 @@ pub struct Config {
     /// Total number of TCP flows the generator should open.
     /// Default 1. Sent to the generator over the control connection at
     /// startup; the generator does not configure this independently.
-    #[serde(default = "default_nonzero_u16")]
-    pub flows: NonZeroU16,
+    #[serde(default = "default_nonzero_u32")]
+    pub flows: NonZeroU32,
     /// Bytes to read per request. Default 1.
     #[serde(default = "default_nonzero_usize")]
     pub request_size: NonZeroUsize,

lading/src/neper/rr.rs

@@ -86,7 +86,7 @@ pub(crate) struct ServerParams {
     pub(crate) threads: u16,
     /// Total number of TCP flows the client should open. Sent to the client
     /// over the control connection during startup.
-    pub(crate) flows: u16,
+    pub(crate) flows: u32,
     /// Bytes to read per request.
     pub(crate) request_size: usize,
     /// Bytes to send per response.
@@ -712,7 +712,7 @@ fn server_thread_main(
     binding_addr: SocketAddr,
     prebuilt_listener: Option<net::TcpListener>,
     backlog: i32,
-    num_flows: u16,
+    num_flows: u32,
     request_size: usize,
     response_size: usize,
     no_delay: bool,