feat(trace): add humanized format for bandwidth

Author: BobAnkh

Cargo.toml

@@ -13,8 +13,8 @@ rust-version = "1.77"
 ctrlc = "3.2.5"
 figment = { version = "0.10", features = ["toml", "env", "json"] }
 futures = "0.3.29"
-humantime = "2.1.0"
-netem-trace = { version = "0.3.1", features = ["serde", "human", "mahimahi"] }
+human-bandwidth = { version = "0.1.1", features = ["serde"] }
+netem-trace = { version = "0.3.3", features = ["serde", "human", "mahimahi"] }
 nix = "0.26.2"
 once_cell = "1.19"
 rand = "0.8.5"
@@ -47,7 +47,8 @@ ctrlc = { workspace = true }
 dirs = "5.0.1"
 figment = { workspace = true }
 futures = { workspace = true }
-humantime = { workspace = true }
+human-bandwidth = { workspace = true }
+humantime = "2.1.0"
 netem-trace = { workspace = true }
 nix = { workspace = true }
 once_cell = { workspace = true }
@@ -73,4 +74,4 @@ debug = true
 # required for cargo flamegraph
 [profile.dev]
 debug = true
-opt-level = 0
+opt-level = 0

config.example.toml

@@ -106,7 +106,7 @@ bw_type = "NetworkLayer"
 # For example, the following line means 1.2 Gbps.
 #
 # Default: Unlimited
-bandwidth = { gbps = 1, bps = 200000000 }
+bandwidth = "1Gbps 200Mbps"
 
 # Queue type
 # Possible values:

rattan-core/Cargo.toml

@@ -17,6 +17,7 @@ figment = { workspace = true }
 camellia = { git = "https://github.com/minhuw/camellia.git", optional = true }
 etherparse = "0.14.3"
 futures = { workspace = true }
+human-bandwidth = { workspace = true }
 humantime-serde = { version = "1.1.1", optional = true }
 ipnet = "2.8.0"
 lazy_static = "1.4.0"

rattan-core/src/devices/bandwidth/mod.rs

@@ -237,6 +237,7 @@ where
     P: Packet,
     Q: PacketQueue<P>,
 {
+    #[cfg_attr(feature = "serde", serde(with = "human_bandwidth::serde"))]
     pub bandwidth: Option<Bandwidth>,
     pub queue_config: Option<Q::Config>,
     pub bw_type: Option<BwType>,

src/main.rs

@@ -88,8 +88,8 @@ pub struct Arguments {
     downlink_delay: Option<Delay>,
 
     /// Uplink bandwidth
-    #[arg(long, global = true, value_name = "Bandwidth", group = "uplink-bw")]
-    uplink_bandwidth: Option<u64>,
+    #[arg(long, global = true, value_name = "Bandwidth", group = "uplink-bw", value_parser = human_bandwidth::parse_bandwidth)]
+    uplink_bandwidth: Option<Bandwidth>,
     /// Uplink trace file
     #[arg(long, global = true, value_name = "Trace File", group = "uplink-bw")]
     uplink_trace: Option<String>,
@@ -107,8 +107,8 @@ pub struct Arguments {
     uplink_queue_args: Option<String>,
 
     /// Downlink bandwidth
-    #[arg(long, global = true, value_name = "Bandwidth", group = "downlink-bw")]
-    downlink_bandwidth: Option<u64>,
+    #[arg(long, global = true, value_name = "Bandwidth", group = "downlink-bw", value_parser = human_bandwidth::parse_bandwidth)]
+    downlink_bandwidth: Option<Bandwidth>,
     /// Downlink trace file
     #[arg(long, global = true, value_name = "Trace File", group = "downlink-bw")]
     downlink_trace: Option<String>,
@@ -402,7 +402,6 @@ fn main() -> ExitCode {
                 let mut downlink_count = 0;
 
                 if let Some(bandwidth) = opts.uplink_bandwidth {
-                    let bandwidth = Bandwidth::from_bps(bandwidth);
                     let device_config = match opts.uplink_queue {
                         Some(QueueType::Infinite) | None => {
                             DeviceBuildConfig::Bw(BwDeviceBuildConfig::Infinite(
@@ -465,7 +464,6 @@ fn main() -> ExitCode {
                 }
 
                 if let Some(bandwidth) = opts.downlink_bandwidth {
-                    let bandwidth = Bandwidth::from_bps(bandwidth);
                     let device_config = match opts.downlink_queue {
                         Some(QueueType::Infinite) | None => {
                             DeviceBuildConfig::Bw(BwDeviceBuildConfig::Infinite(