feat(msg-sim): configurable runtime

Author: thedevbirb

msg-sim/examples/bdp_throughput.rs

@@ -24,7 +24,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     use futures::StreamExt;
     use msg_sim::{
         ip::Subnet,
-        network::{Link, Network, PeerIdExt},
+        network::{HubOptions, Link, Network, PeerIdExt, PeerOptions},
         tc::impairment::LinkImpairment,
     };
     use msg_socket::{RepSocket, ReqSocket};
@@ -92,9 +92,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("Transfer: {} messages × {} KB = {} MB\n", NUM_MESSAGES, MSG_SIZE / 1024, total_mb);
 
     let subnet = Subnet::new(IpAddr::V4(Ipv4Addr::new(10, 100, 0, 0)), 16);
-    let mut network = Network::new(subnet).await?;
-    let sender = network.add_peer().await?;
-    let receiver = network.add_peer().await?;
+    let mut network = Network::new(subnet, HubOptions::default()).await?;
+    let sender = network.add_peer(PeerOptions::default()).await?;
+    let receiver = network.add_peer(PeerOptions::default()).await?;
 
     let impairment =
         LinkImpairment::default().with_latency_ms(LATENCY_MS).with_bandwidth_mbit_s(BANDWIDTH_MBIT);

msg-sim/examples/sim_multi_region.rs

@@ -32,7 +32,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     use msg_sim::{
         ip::Subnet,
-        network::{Link, Network, PeerIdExt},
+        network::{HubOptions, Link, Network, PeerIdExt, PeerOptions},
     };
     use tracing_subscriber::EnvFilter;
 
@@ -161,13 +161,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Create network
     let subnet = Subnet::new(IpAddr::V4(Ipv4Addr::new(10, 0, 0, 0)), 24);
-    let mut network = Network::new(subnet).await?;
+    let mut network = Network::new(subnet, HubOptions::default()).await?;
 
     // Add peers
-    let eu = network.add_peer().await?;
-    let us1 = network.add_peer().await?;
-    let us2 = network.add_peer().await?;
-    let tokyo = network.add_peer().await?;
+    let eu = network.add_peer(PeerOptions::default()).await?;
+    let us1 = network.add_peer(PeerOptions::default()).await?;
+    let us2 = network.add_peer(PeerOptions::default()).await?;
+    let tokyo = network.add_peer(PeerOptions::default()).await?;
 
     println!("Peers:");
     for id in [eu, us1, us2, tokyo] {

msg-sim/examples/tcp_tuning.rs

@@ -14,7 +14,7 @@ fn main() {}
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     use std::net::{IpAddr, Ipv4Addr};
 
-    use msg_sim::{ip::Subnet, network::Network};
+    use msg_sim::{ip::Subnet, network::{HubOptions, Network, PeerOptions}};
     use tracing_subscriber::EnvFilter;
 
     const TCP_RMEM: &str = "/proc/sys/net/ipv4/tcp_rmem";
@@ -41,8 +41,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Create network with one peer
     let subnet = Subnet::new(IpAddr::V4(Ipv4Addr::new(10, 0, 0, 0)), 24);
-    let mut network = Network::new(subnet).await?;
-    let peer = network.add_peer().await?;
+    let mut network = Network::new(subnet, HubOptions::default()).await?;
+    let peer = network.add_peer(PeerOptions::default()).await?;
 
     // Tune TCP buffers in peer's namespace (min, default, max)
     let tuned_buffers = "4096 1048576 16777216"; // 4KB / 1MB / 16MB

msg-sim/src/namespace.rs

@@ -8,6 +8,7 @@ use tokio::sync::oneshot;
 
 use crate::dynch::{DynCh, DynRequestSender};
 use crate::namespace::helpers::current_netns;
+use crate::network::RuntimeMakerFn;
 
 /// Base directory for named network namespaces.
 ///
@@ -230,6 +231,7 @@ impl NetworkNamespaceInner {
     /// `setns(2)`, which is thread-local.
     pub fn spawn<Ctx: 'static>(
         self,
+        make_runtime: RuntimeMakerFn,
         make_ctx: impl FnOnce() -> Ctx + Send + 'static,
     ) -> (std::thread::JoinHandle<Result<()>>, DynRequestSender<Ctx>) {
         let (tx, mut rx) = DynCh::<Ctx>::channel(8);
@@ -245,7 +247,7 @@ impl NetworkNamespaceInner {
             // Create mount namespace and remount /proc for namespace-specific sysctl access
             helpers::setup_mount_namespace()?;
 
-            let rt = tokio::runtime::Builder::new_current_thread().enable_all().build()?;
+            let rt = make_runtime();
 
             tracing::debug!("started runtime");
             drop(_span);
@@ -286,6 +288,7 @@ pub struct NetworkNamespace<Ctx = ()> {
 impl NetworkNamespace {
     pub async fn new<Ctx: 'static>(
         name: impl Into<String>,
+        make_runtime: RuntimeMakerFn,
         make_ctx: impl FnOnce() -> Ctx + Send + 'static,
     ) -> Result<NetworkNamespace<Ctx>> {
         let name = name.into();
@@ -296,7 +299,7 @@ impl NetworkNamespace {
         let file = tokio::fs::File::open(path).await?.into_std().await;
 
         let inner = NetworkNamespaceInner { name, file };
-        let (_receiver_task, task_sender) = inner.try_clone()?.spawn(make_ctx);
+        let (_receiver_task, task_sender) = inner.try_clone()?.spawn(make_runtime, make_ctx);
 
         Ok(NetworkNamespace::<Ctx> { inner, task_sender, _receiver_task })
     }
@@ -349,11 +352,18 @@ mod tests {
 
     const TCP_SLOW_START_AFTER_IDLE: &str = "/proc/sys/net/ipv4/tcp_slow_start_after_idle";
 
+    fn default_runtime() -> tokio::runtime::Runtime {
+        tokio::runtime::Builder::new_multi_thread()
+            .enable_all()
+            .build()
+            .expect("to create runtime")
+    }
+
     #[tokio::test(flavor = "multi_thread")]
     async fn mount_namespace_isolates_proc() {
         // Create two namespaces
-        let ns1 = NetworkNamespace::new("test-ns-mount-1", || ()).await.unwrap();
-        let ns2 = NetworkNamespace::new("test-ns-mount-2", || ()).await.unwrap();
+        let ns1 = NetworkNamespace::new("test-ns-mount-1", Box::new(default_runtime), || ()).await.unwrap();
+        let ns2 = NetworkNamespace::new("test-ns-mount-2", Box::new(default_runtime), || ()).await.unwrap();
 
         // Verify /proc is mounted in ns1 by checking /proc/self/ns/net exists
         let proc_mounted_ns1: bool = ns1
@@ -385,8 +395,8 @@ mod tests {
     #[tokio::test(flavor = "multi_thread")]
     async fn sysctl_values_are_namespace_specific() {
         // Create two namespaces
-        let ns1 = NetworkNamespace::new("test-ns-sysctl-1", || ()).await.unwrap();
-        let ns2 = NetworkNamespace::new("test-ns-sysctl-2", || ()).await.unwrap();
+        let ns1 = NetworkNamespace::new("test-ns-sysctl-1", Box::new(default_runtime), || ()).await.unwrap();
+        let ns2 = NetworkNamespace::new("test-ns-sysctl-2", Box::new(default_runtime), || ()).await.unwrap();
 
         // Set different values in each namespace
         let write_result_ns1: std::io::Result<()> = ns1
@@ -446,24 +456,19 @@ mod tests {
 
         assert_eq!(value_ns1, "0", "ns1 should have tcp_slow_start_after_idle=0");
         assert_eq!(value_ns2, "1", "ns2 should have tcp_slow_start_after_idle=1");
-        assert_ne!(
-            value_ns1, value_ns2,
-            "sysctls should be isolated between namespaces"
-        );
+        assert_ne!(value_ns1, value_ns2, "sysctls should be isolated between namespaces");
     }
 
     #[tokio::test(flavor = "multi_thread")]
     async fn namespace_has_isolated_network_identity() {
         // Create a namespace
-        let ns = NetworkNamespace::new("test-ns-identity", || ()).await.unwrap();
+        let ns = NetworkNamespace::new("test-ns-identity", Box::new(default_runtime), || ()).await.unwrap();
 
         // Get the network namespace inode from inside the namespace
         let ns_inode_inside: u64 = ns
             .task_sender
             .submit(|_: &mut ()| -> DynFuture<'_, u64> {
-                Box::pin(async {
-                    helpers::current_netns().map(|id| id.inode).unwrap_or(0)
-                })
+                Box::pin(async { helpers::current_netns().map(|id| id.inode).unwrap_or(0) })
             })
             .await
             .unwrap()
@@ -476,9 +481,6 @@ mod tests {
 
         assert_ne!(ns_inode_inside, 0, "should get valid inode inside namespace");
         assert_ne!(host_inode, 0, "should get valid host inode");
-        assert_ne!(
-            ns_inode_inside, host_inode,
-            "namespace inode should differ from host"
-        );
+        assert_ne!(ns_inode_inside, host_inode, "namespace inode should differ from host");
     }
 }