Merge pull request #25 from YousefEZ/cmdline

Removed logs, corrected spelling mistake and changed docker run cmd format
YousefEZ · Apr 6, 2024 · 302e655 · 302e655
2 parents 5a6f6ed + bf596ee
commit 302e655
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -4,7 +4,7 @@ rm -rf traces/
 mkdir traces
 
 cp user_src/* scratch/
-export NS_LOG=FRRQueue=level_all
+# export NS_LOG=FRRQueue=level_all
 
 cp ./run_ns3.sh ./.
 
@@ -15,9 +15,9 @@ if [ $? -ne 0 ]; then
 	exit 1
 fi
 
-if [ -z "$1" ]; then
-	exit 0
-fi
+# if [ -z "$1" ]; then
+# 	exit 0
+# fi
 
 # ./ns3 run 'scratch/combined-frr.cc --delay_bottleneck=1ms'
 ./run_ns3.sh

diff --git a/run_ns3.sh b/run_ns3.sh
@@ -12,10 +12,10 @@ run_experiment() {
 	mkdir -p "$dir/baseline-udp/"
 	mkdir -p "$dir/baseline-no-udp/"
 
-	./ns3 run "scratch/combined-frr.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/frr/"
-	./ns3 run "scratch/combined-frr-no-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/frr-no-udp/"
-	./ns3 run "scratch/combined-baseline-udp.cc --$test_vaiable=$test_value --policy_threshold=$policy_threshold --dir=$dir/baseline-udp/"
-	./ns3 run "scratch/combined-baseline-no-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/baseline-no-udp/"
+	NS_LOG="" ./ns3 run "scratch/combined-frr.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/frr/"
+	NS_LOG="" ./ns3 run "scratch/combined-frr-no-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/frr-no-udp/"
+	NS_LOG="" ./ns3 run "scratch/combined-baseline-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/baseline-udp/"
+	NS_LOG="" ./ns3 run "scratch/combined-baseline-no-udp.cc --$test_variable=$test_value --policy_threshold=$policy_threshold --dir=$dir/baseline-no-udp/"
 }
 
 # Delay primary experiments

diff --git a/src/combined-baseline-no-udp.cc b/src/combined-baseline-no-udp.cc
@@ -144,11 +144,10 @@ int main(int argc, char* argv[])
     cmd.AddValue("dir", "Traces directory", dir);
     cmd.Parse(argc, argv);
 
-    std::cout << "Congestion policy threshold: " << cong_threshold << std::endl;
     BasicCongestionPolicy::usage_percentage = cong_threshold;
 
-    // LogComponentEnable("FRRQueue", LOG_LEVEL_ERROR);
-    // LogComponentEnableAll(LOG_LEVEL_ERROR);
+    // LogComponentEnable("FRRQueue", LOG_LEVEL_LOGIC);
+    LogComponentEnableAll(LOG_LEVEL_ERROR);
     /*
      *  +----------+      +-----------+
      *  |Congestion|      |  Traffic  |

diff --git a/src/combined-baseline-udp.cc b/src/combined-baseline-udp.cc
@@ -143,12 +143,10 @@ int main(int argc, char* argv[])
     cmd.AddValue("dir", "Traces directory", dir);
     cmd.Parse(argc, argv);
 
-    std::cout << "Congestion policy threshold: " << cong_threshold << std::endl;
     BasicCongestionPolicy::usage_percentage = cong_threshold;
 
-    // LogComponentEnable("FRRQueue", LOG_LEVEL_ERROR);
-    // LogComponentEnableAll(LOG_LEVEL_ERROR);
-
+    // LogComponentEnable("FRRQueue", LOG_LEVEL_LOGIC);
+    LogComponentEnableAll(LOG_LEVEL_ERROR);
     /*
      *  +----------+      +-----------+
      *  |Congestion|      |  Traffic  |

diff --git a/src/combined-frr-no-udp.cc b/src/combined-frr-no-udp.cc
@@ -143,10 +143,10 @@ int main(int argc, char* argv[])
     cmd.AddValue("dir", "Traces directory", dir);
     cmd.Parse(argc, argv);
 
-    std::cout << "Congestion policy threshold: " << cong_threshold << std::endl;
     BasicCongestionPolicy::usage_percentage = cong_threshold;
 
-    LogComponentEnable("FRRQueue", LOG_LEVEL_LOGIC);
+    // LogComponentEnable("FRRQueue", LOG_LEVEL_LOGIC);
+    LogComponentEnableAll(LOG_LEVEL_ERROR);
     /*
      *  +----------+      +-----------+
      *  |Congestion|      |  Traffic  |

diff --git a/src/combined-frr.cc b/src/combined-frr.cc
@@ -118,11 +118,10 @@ int main(int argc, char* argv[])
     cmd.AddValue("dir", "Traces directory", dir);
     cmd.Parse(argc, argv);
 
-    std::cout << "Congestion policy threshold: " << cong_threshold << std::endl;
     BasicCongestionPolicy::usage_percentage = cong_threshold;
 
     // LogComponentEnable("FRRQueue", LOG_LEVEL_ERROR);
-    // LogComponentEnableAll(LOG_LEVEL_ERROR);
+    LogComponentEnableAll(LOG_LEVEL_ERROR);
     /*
      *  +----------+      +-----------+
      *  |Congestion|      |  Traffic  |