add packet queues to BwDevice

Cargo.toml

@@ -1,2 +1,3 @@
 [workspace]
 members = ['rattan', 'rattan-cli']
+resolver = "2"

rattan-cli/src/docker.rs

@@ -9,7 +9,7 @@ use rand::{rngs::StdRng, SeedableRng};
 use rattan::{
     core::{RattanMachine, RattanMachineConfig},
     devices::{
-        bandwidth::{BwDevice, BwDeviceConfig},
+        bandwidth::{queue::InfiniteQueue, BwDevice, BwDeviceConfig, MAX_BANDWIDTH},
         external::VirtualEthernet,
     },
     env::get_container_env,
@@ -169,15 +169,15 @@ pub fn docker_main(opts: CommandArgs) -> anyhow::Result<()> {
                 let mut left_fd = vec![left_device_rx];
                 let mut right_fd = vec![right_device_rx];
                 if let Some(bandwidth) = bandwidth {
-                    let left_bw_device = BwDevice::<StdPacket>::new();
-                    let right_bw_device = BwDevice::<StdPacket>::new();
+                    let left_bw_device = BwDevice::new(MAX_BANDWIDTH, InfiniteQueue::new());
+                    let right_bw_device = BwDevice::new(MAX_BANDWIDTH, InfiniteQueue::new());
                     let left_bw_ctl = left_bw_device.control_interface();
                     let right_bw_ctl = right_bw_device.control_interface();
                     left_bw_ctl
-                        .set_config(BwDeviceConfig::new(bandwidth))
+                        .set_config(BwDeviceConfig::new(bandwidth, None))
                         .unwrap();
                     right_bw_ctl
-                        .set_config(BwDeviceConfig::new(bandwidth))
+                        .set_config(BwDeviceConfig::new(bandwidth, None))
                         .unwrap();
                     let (left_bw_rx, left_bw_tx) = machine.add_device(left_bw_device);
                     info!(left_bw_rx, left_bw_tx);

rattan-cli/src/main.rs

@@ -2,7 +2,7 @@ use clap::Parser;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 use rattan::core::{RattanMachine, RattanMachineConfig};
-use rattan::devices::bandwidth::{BwDevice, BwDeviceConfig};
+use rattan::devices::bandwidth::{queue::InfiniteQueue, BwDevice, BwDeviceConfig, MAX_BANDWIDTH};
 use rattan::devices::delay::{DelayDevice, DelayDeviceConfig};
 use rattan::devices::external::VirtualEthernet;
 use rattan::devices::loss::{IIDLossDevice, IIDLossDeviceConfig};
@@ -93,15 +93,15 @@ fn main() {
                 let mut left_fd = vec![left_device_rx];
                 let mut right_fd = vec![right_device_rx];
                 if let Some(bandwidth) = bandwidth {
-                    let left_bw_device = BwDevice::<StdPacket>::new();
-                    let right_bw_device = BwDevice::<StdPacket>::new();
+                    let left_bw_device = BwDevice::new(MAX_BANDWIDTH, InfiniteQueue::new());
+                    let right_bw_device = BwDevice::new(MAX_BANDWIDTH, InfiniteQueue::new());
                     let left_bw_ctl = left_bw_device.control_interface();
                     let right_bw_ctl = right_bw_device.control_interface();
                     left_bw_ctl
-                        .set_config(BwDeviceConfig::new(bandwidth))
+                        .set_config(BwDeviceConfig::new(bandwidth, None))
                         .unwrap();
                     right_bw_ctl
-                        .set_config(BwDeviceConfig::new(bandwidth))
+                        .set_config(BwDeviceConfig::new(bandwidth, None))
                         .unwrap();
                     let (left_bw_rx, left_bw_tx) = machine.add_device(left_bw_device);
                     info!(left_bw_rx, left_bw_tx);
@@ -187,7 +187,8 @@ fn main() {
         let output = handle.wait_with_output().unwrap();
         let stdout = String::from_utf8(output.stdout).unwrap();
         stdout.contains("time=")
-    }; match res {
+    };
+    match res {
         true => {
             info!("ping test passed");
             left_ns.enter().unwrap();

rattan/benches/bandwidth.rs

@@ -3,7 +3,11 @@ use std::{sync::Arc, thread::JoinHandle};
 use criterion::{criterion_group, criterion_main, Criterion};
 use rattan::{
     core::{RattanMachine, RattanMachineConfig},
-    devices::{bandwidth::BwDevice, external::VirtualEthernet, StdPacket},
+    devices::{
+        bandwidth::{queue::InfiniteQueue, BwDevice, MAX_BANDWIDTH},
+        external::VirtualEthernet,
+        StdPacket,
+    },
     env::{get_std_env, StdNetEnvConfig},
     metal::{io::AfPacketDriver, netns::NetNs},
 };
@@ -26,8 +30,8 @@ fn prepare_env() -> (JoinHandle<()>, CancellationToken, Arc<NetNs>, Arc<NetNs>)
             .unwrap();
 
         runtime.block_on(async move {
-            let left_bw_device = BwDevice::<StdPacket>::new();
-            let right_bw_device = BwDevice::<StdPacket>::new();
+            let left_bw_device = BwDevice::new(MAX_BANDWIDTH, InfiniteQueue::new());
+            let right_bw_device = BwDevice::new(MAX_BANDWIDTH, InfiniteQueue::new());
             let left_device =
                 VirtualEthernet::<StdPacket, AfPacketDriver>::new(_std_env.left_pair.right.clone());
             let right_device =