topo: add plot optimized mode

Author: BugenZhao

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "flashroute_rs"
-version = "0.2.3"
+version = "0.2.4"
 authors = [
     "Bugen Zhao <[email protected]>",
     "Zhengdong Wang <[email protected]>",

Cargo.toml

@@ -3,6 +3,8 @@ use std::{
     sync::atomic::{AtomicBool, AtomicU8, Ordering::SeqCst},
 };
 
+use crate::OPT;
+
 #[derive(Debug)]
 pub struct DstCtrlBlock {
     pub addr: Ipv4Addr,
@@ -95,7 +97,13 @@ impl DstCtrlBlock {
     }
 
     pub fn stop_backward(&self) {
-        self.next_backward_hop.fetch_min(0, SeqCst);
+        if OPT.plot_optimized {
+            if self.backward_count.load(SeqCst) >= 2 {
+                self.next_backward_hop.fetch_min(0, SeqCst);
+            }
+        } else {
+            self.next_backward_hop.fetch_min(0, SeqCst);
+        }
     }
 
     pub fn stop_forward(&self) {

src/dcb.rs

@@ -49,6 +49,8 @@ pub struct Opt {
     pub layout: String,
     #[structopt(long = "no-spline", parse(from_flag = std::ops::Not::not))]
     pub spline: bool,
+    #[structopt(short = "p", long)]
+    pub plot_optimized: bool,
 
     // Misc
     #[structopt(long, default_value = "114514")]
@@ -100,6 +102,9 @@ pub fn get_opt() -> Opt {
         log::warn!("Probing rate is 0, rate limit will be turned off.");
         opt.probing_rate = u64::MAX;
     }
+    if opt.plot_optimized {
+        opt.redundancy_removal = false;
+    }
     opt
 }
 

src/opt.rs

@@ -51,9 +51,11 @@ impl Topo {
                 }
             }
             for (a, b) in results.iter().zip(results.iter().skip(1)) {
-                let dist = b.distance - a.distance;
-                graph.add_node(b.responder);
-                graph.add_edge(a.responder, b.responder, dist);
+                if a.responder != b.responder {
+                    let dist = b.distance - a.distance;
+                    graph.add_node(b.responder);
+                    graph.add_edge(a.responder, b.responder, dist);
+                }
             }
         };