move to async #4

.github/workflows/ci.yml

@@ -56,18 +56,18 @@ jobs:
     strategy:
       matrix:
         build:
-          - linux-stable
-          - macos-stable
+#          - linux-stable
+#          - macos-stable
           - windows-stable
         include:
-          - build: linux-stable
-            os: ubuntu-20.04
-            target: x86_64-unknown-linux-gnu
-            rust: stable
-          - build: macos-stable
-            os: macos-latest
-            target: x86_64-apple-darwin
-            rust: stable
+#          - build: linux-stable
+#            os: ubuntu-20.04
+#            target: x86_64-unknown-linux-gnu
+#            rust: stable
+#          - build: macos-stable
+#            os: macos-latest
+#            target: x86_64-apple-darwin
+#            rust: stable
           - build: windows-stable
             os: windows-latest
             target: x86_64-pc-windows-msvc
@@ -94,8 +94,29 @@ jobs:
         if: ${{ ! startsWith(matrix.build, 'windows') }}
         run: sudo -E env "PATH=$PATH" cargo test --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
       - name: Run simulation test on ${{ matrix.build }}
+        if: startsWith(matrix.build, 'windows')
+        run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
+      - name: Run simulation test on ${{ matrix.build }}
+        if: startsWith(matrix.build, 'windows')
         run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
+      - name: Run simulation test on ${{ matrix.build }}
         if: startsWith(matrix.build, 'windows')
+        run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
+      - name: Run simulation test on ${{ matrix.build }}
+        if: startsWith(matrix.build, 'windows')
+        run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
+      - name: Run simulation test on ${{ matrix.build }}
+        if: startsWith(matrix.build, 'windows')
+        run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
+      - name: Run simulation test on ${{ matrix.build }}
+        if: startsWith(matrix.build, 'windows')
+        run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
+      - name: Run simulation test on ${{ matrix.build }}
+        if: startsWith(matrix.build, 'windows')
+        run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
+      - name: Run simulation test on ${{ matrix.build }}
+        if: startsWith(matrix.build, 'windows')
+        run: cargo test --target --target ${{ matrix.target }} --features sim-tests --test sim -- --exact --nocapture
 
   fmt:
     runs-on: ubuntu-22.04

Cargo.toml

@@ -85,7 +85,7 @@ test-case = "3.3.1"
 tun = { version = "0.6.1", features = [ "async" ] }
 serde_yaml = "0.9.30"
 tokio = { version = "1.35.1", features = [ "full" ] }
-tokio-util = "0.7.10"
+tokio-util = { version = "0.7.10" }
 
 [features]
 # Enable simulation integration tests

tests/sim/tests.rs

@@ -31,17 +31,24 @@ async fn run_simulation(simulation: Simulation) -> anyhow::Result<()> {
     let handle = tokio::spawn(network::run(tun, sim.clone(), token.clone()));
 
     // spawn the tracer as a blocking task and wait for it to finish or fail.
-    tokio::task::spawn_blocking(move || tracer::Tracer::new(sim).trace()).await??;
+    let handle2 = tokio::task::spawn_blocking(move || tracer::Tracer::new(sim, token).trace());
 
-    println!("tracing complete");
+    // println!("tracing complete");
 
-    // notify the network simulator to stop.
-    token.cancel();
-
-    println!("cancel signalled");
+    // // notify the network simulator to stop.
+    // token.cancel();
+    //
+    // println!("cancel signalled");
 
     // join the network simulator task once it has shutdown.
-    handle.await??;
+    // handle.await??;
+
+    // handle.await??;
+
+    let (a, b) = tokio::try_join!(handle, handle2)?;
+
+    a?;
+    b?;
 
     println!("joined sim");
 

tests/sim/tracer.rs

@@ -1,24 +1,27 @@
 use crate::simulation::{Response, Simulation, SingleHost};
 use std::num::NonZeroUsize;
 use std::sync::Arc;
+use tokio_util::sync::CancellationToken;
 use trippy::tracing::{
     Builder, CompletionReason, MaxRounds, ProbeStatus, TimeToLive, TraceId, TracerRound,
 };
 
 pub struct Tracer {
     sim: Arc<Simulation>,
+    pub token: CancellationToken,
 }
 
 impl Tracer {
-    pub fn new(sim: Arc<Simulation>) -> Self {
-        Self { sim }
+    pub fn new(sim: Arc<Simulation>, token: CancellationToken) -> Self {
+        Self { sim, token }
     }
 
     pub fn trace(&self) -> anyhow::Result<()> {
         Builder::new(self.sim.target, |round| self.validate_round(round))
             .trace_identifier(TraceId(self.sim.icmp_identifier))
             .max_rounds(MaxRounds(NonZeroUsize::MIN))
             .start()?;
+        self.token.cancel();
         Ok(())
     }