feat: Add bd test

compare_other.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+function do_compare() {
+    scenario=$1
+    echo "Running $scenario"
+    for i in {1..5}
+    do
+        echo "Running $scenario $i"
+        mkdir -p /mini-ndn/compare_data/${scenario}_10ms
+        python scenarios/$scenario.py compare_10ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_10ms/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_20ms
+        python scenarios/$scenario.py compare_20ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_20ms/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_40ms
+        python scenarios/$scenario.py compare_40ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_40ms/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_60ms
+        python scenarios/$scenario.py compare_60ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_60ms/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_80ms
+        python scenarios/$scenario.py compare_80ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_80ms/${i}
+    done
+    echo "Finished $scenario"
+}
+
+function do_bd_compare() {
+    scenario=$1
+    echo "Running $scenario"
+    for i in {1..5}
+    do
+        echo "Running $scenario $i"
+        mkdir -p /mini-ndn/compare_data/${scenario}_5M
+        python scenarios/$scenario.py compare_100ms_5M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_5M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_10M
+        python scenarios/$scenario.py compare_100ms_10M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_10M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_15M
+        python scenarios/$scenario.py compare_100ms_15M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_15M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_20M
+        python scenarios/$scenario.py compare_100ms_20M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_20M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_25M
+        python scenarios/$scenario.py compare_100ms_25M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_25M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_30M
+        python scenarios/$scenario.py compare_100ms_30M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_30M/${i}
+    done
+    echo "Finished $scenario"
+}
+
+do_compare "cubic_reno"
+do_compare "cubic_cubic"
+do_compare "cubic_bic"
+do_compare "cubic_bbr"
+#do_compare "cubic_qsccp"
+do_compare "reno_reno"
+do_compare "bic_bic"
+do_compare "bbr_bbr"
+#do_compare "qsccp_qsccp"
+
+do_bd_compare "reno_reno"
+do_bd_compare "cubic_cubic"
+do_bd_compare "bic_bic"
+do_bd_compare "bbr_bbr"
+#do_bd_compare "qsccp_qsccp"
+
+do_bd_compare "cubic_reno"
+do_bd_compare "cubic_bic"
+do_bd_compare "cubic_bbr"
+#do_bd_compare "cubic_qsccp"

compare_qsccp.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+function do_compare() {
+    scenario=$1
+    echo "Running $scenario"
+    for i in {1..5}
+    do
+        echo "Running $scenario $i"
+        mkdir -p /mini-ndn/compare_data/${scenario}_10ms
+        python scenarios/$scenario.py compare_10ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_10ms/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_20ms
+        python scenarios/$scenario.py compare_20ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_20ms/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_40ms
+        python scenarios/$scenario.py compare_40ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_40ms/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_60ms
+        python scenarios/$scenario.py compare_60ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_60ms/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_80ms
+        python scenarios/$scenario.py compare_80ms.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_80ms/${i}
+    done
+    echo "Finished $scenario"
+}
+
+function do_bd_compare() {
+    scenario=$1
+    echo "Running $scenario"
+    for i in {1..5}
+    do
+        echo "Running $scenario $i"
+        mkdir -p /mini-ndn/compare_data/${scenario}_5M
+        python scenarios/$scenario.py compare_100ms_5M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_5M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_10M
+        python scenarios/$scenario.py compare_100ms_10M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_10M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_15M
+        python scenarios/$scenario.py compare_100ms_15M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_15M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_20M
+        python scenarios/$scenario.py compare_100ms_20M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_20M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_25M
+        python scenarios/$scenario.py compare_100ms_25M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_25M/${i}
+        mkdir -p /mini-ndn/compare_data/${scenario}_30M
+        python scenarios/$scenario.py compare_100ms_30M.conf
+        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_30M/${i}
+    done
+    echo "Finished $scenario"
+}
+
+#do_compare "cubic_reno"
+#do_compare "cubic_cubic"
+#do_compare "cubic_bic"
+#do_compare "cubic_bbr"
+do_compare "cubic_qsccp"
+#do_compare "reno_reno"
+#do_compare "bic_bic"
+#do_compare "bbr_bbr"
+do_compare "qsccp_qsccp"
+
+#do_bd_compare "reno_reno"
+#do_bd_compare "cubic_cubic"
+#do_bd_compare "bic_bic"
+#do_bd_compare "bbr_bbr"
+do_bd_compare "qsccp_qsccp"
+
+#do_bd_compare "cubic_reno"
+#do_bd_compare "cubic_bic"
+#do_bd_compare "cubic_bbr"
+do_bd_compare "cubic_qsccp"

compare_test.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-function do_compare() {
-    scenario=$1
-    echo "Running $scenario"
-    for i in {1..10}
-    do
-        echo "Running $scenario $i"
-        mkdir -p /mini-ndn/compare_data/${scenario}_50ms
-        python scenarios/$scenario.py compare_50ms.conf
-        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_50ms/${i}
-        mkdir -p /mini-ndn/compare_data/${scenario}_100ms
-        python scenarios/$scenario.py compare_100ms.conf
-        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_100ms/${i}
-        mkdir -p /mini-ndn/compare_data/${scenario}_150ms
-        python scenarios/$scenario.py compare_150ms.conf
-        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_150ms/${i}
-        mkdir -p /mini-ndn/compare_data/${scenario}_200ms
-        python scenarios/$scenario.py compare_200ms.conf
-        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_200ms/${i}
-        mkdir -p /mini-ndn/compare_data/${scenario}_250ms
-        python scenarios/$scenario.py compare_250ms.conf
-        mv /tmp/minindn /mini-ndn/compare_data/${scenario}_250ms/${i}
-    done
-    echo "Finished $scenario"
-}
-
-do_compare "cubic_reno"
-do_compare "cubic_cubic"
-do_compare "cubic_bic"
-do_compare "cubic_bbr"
-# do_compare "cubic_qsccp"

compress.sh

@@ -2,17 +2,30 @@ function do_compress() {
     scenario=$1
     for i in {1..10}
     do
-        for ms in 50 100 150 200 250
+        for ms in 30 50 100 150 200 250 300
         do
             ls ${scenario}_${ms}ms/${i}
             find ${scenario}_${ms}ms/${i} -mindepth 1 -maxdepth 1 -not \( -name 'c1' -or -name 'c2' \) -exec rm -rf {} \;
             # 遍历 ${scenario}_${ms}ms/1-10 目录，删除里面所有不为 c1 或者 c2 的文件和目录
             # find ${scenario}_${ms}ms/${i} -maxdepth 1 -not \( -name 'c1' -or -name 'c2' \) -exec rm -rf {} \;
         done
+
+	for bd in 1 5 10 15 20 40 80 120 160
+	do
+            ls ${scenario}_${bd}M/${i}
+            find ${scenario}_${bd}M/${i} -mindepth 1 -maxdepth 1 -not \( -name 'c1' -or -name 'c2' \) -exec rm -rf {} \;
+            # 遍历 ${scenario}_${ms}ms/1-10 目录，删除里面所有不为 c1 或者 c2 的文件和目录
+            # find ${scenario}_${ms}ms/${i} -maxdepth 1 -not \( -name 'c1' -or -name 'c2' \) -exec rm -rf {} \;
+	done
     done
 }
 
 do_compress "compare_data/cubic_qsccp"
 do_compress "compare_data/cubic_reno"
 do_compress "compare_data/cubic_bic"
-do_compress "compare_data/cubic_cubic"
+do_compress "compare_data/cubic_bbr"
+do_compress "compare_data/cubic_cubic"
+do_compress "compare_data/reno_reno"
+do_compress "compare_data/bic_bic"
+do_compress "compare_data/bbr_bbr"
+do_compress "compare_data/qsccp_qsccp"

topologies/compare_100ms_10M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=10
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_120M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=120
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_15M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=15
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_160M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=160
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_1M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=1
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_20M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=20
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_25M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=25
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_30M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=30
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_40M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=40
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_5M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=5
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_100ms_80M.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=80ms bw=80
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_10ms.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=5ms bw=100
+C2:R1 delay=5ms bw=100
+R1:R2 delay=5ms bw=10
+R2:P1 delay=5ms bw=100
+R2:P2 delay=5ms bw=100
+

topologies/compare_20ms.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=10ms bw=10
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_300ms.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=280ms bw=10
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_30ms.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=20ms bw=10
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_40ms.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=30ms bw=10
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_60ms.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=50ms bw=10
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+

topologies/compare_80ms.conf

@@ -0,0 +1,15 @@
+[nodes]
+C1: _
+C2: _
+R1: _
+R2: _
+P1: _
+P2: _
+
+[links]
+C1:R1 delay=10ms bw=100
+C2:R1 delay=10ms bw=100
+R1:R2 delay=70ms bw=10
+R2:P1 delay=10ms bw=100
+R2:P2 delay=10ms bw=100
+