Changed docker to not require argument, removed most logs/all from NS3

YousefEZ · Apr 6, 2024 · 8af17d9 · 8af17d9
1 parent eb8f608
commit 8af17d9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/entrypoint.sh b/entrypoint.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/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,7 +118,6 @@ 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);