Terminate smoothly on CTRL-C.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index e9aa9b078b1b640677ebc3b9c9fb4e14ad217851..2994640bf6e7f0c766ea6ca66637bcbd5ab804a7 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -9,13 +9,17 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 #include "deployment.h"
 #include "process.h"
 
 #include "deployment.h"
 #include "process.h"

-#include "loba_simple.h"
+#include "loba_besteffort.h"

 #include "loba_fairstrategy.h"
 #include "loba_makhoul.h"
 #include "loba_fairstrategy.h"
 #include "loba_makhoul.h"

+#include "loba_makhoul2.h"
+#include "loba_simple.h"

 #include "misc.h"
 
 #include "options.h"
 
 #include "misc.h"
 
 #include "options.h"
 

+#define DATA_DESCR_WIDTH 42
+

 namespace opt {
 
     // Constants
 namespace opt {
 
     // Constants


@@ -31,6 +35,7 @@ namespace opt {
 
     // Simulation parameters
     int log_rate = 1;
 
     // Simulation parameters
     int log_rate = 1;

+    bool exit_request = false;

 
     // Platform and deployment
     std::string platform_file;
 
     // Platform and deployment
     std::string platform_file;


@@ -68,10 +73,14 @@ namespace opt {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
     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("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",
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);
         NOL_INSERT("simple", "balance with least loaded neighbor",


@@ -135,10 +144,9 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
 
 const char* opt_helper::descr(const char* str)
 {

-    const int descr_width = 40;

     std::string& res = descr_str;
     res = str;
     std::string& res = descr_str;
     res = str;

-    res.resize(descr_width, '.');
+    res.resize(DATA_DESCR_WIDTH, '.');

     return res.c_str();
 }
 
     return res.c_str();
 }