Terminate smoothly on CTRL-C.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 0d269d65feb49d583fa53661537bf8607d7b1d48..2994640bf6e7f0c766ea6ca66637bcbd5ab804a7 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -9,9 +9,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 #include "deployment.h"
 #include "process.h"
-#include "loba_simple.h"
+#include "loba_besteffort.h"
 #include "loba_fairstrategy.h"
 #include "loba_makhoul.h"
+#include "loba_makhoul2.h"
+#include "loba_simple.h"
 #include "misc.h"
 
 #include "options.h"
@@ -33,6 +35,7 @@ namespace opt {
 
     // Simulation parameters
     int log_rate = 1;
+    bool exit_request = false;
 
     // Platform and deployment
     std::string platform_file;
@@ -70,10 +73,14 @@ namespace opt {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
+        NOL_INSERT("besteffort", "balance with best effort strategy",
+                   loba_besteffort);
         NOL_INSERT("fairstrategy", "balance with fair strategy",
                    loba_fairstrategy);
         NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",
                    loba_makhoul);
+        NOL_INSERT("makhoul2", "balance with Makhoul's source code",
+                   loba_makhoul2);
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);
         NOL_INSERT("simple", "balance with least loaded neighbor",