Cosmetics: declare condition_t as friend of mutex_t.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 23783fa5717e277983e199906196d23a0b266e7c..3eed8a259731798ba790f1c59eafad44798b01fc 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -11,7 +11,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "deployment.h"
 #include "process.h"
 #include "loba_besteffort.h"
+#include "loba_bulk.h"
 #include "loba_fairstrategy.h"
+#include "loba_lln.h"
 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"
 #include "loba_simple.h"
@@ -37,7 +39,7 @@ namespace opt {
 
     // Simulation parameters
     int log_rate = 1;
-    bool exit_request = false;
+    volatile std::sig_atomic_t exit_request = 0;
 
     // Platform and deployment
     std::string platform_file;
@@ -79,8 +81,12 @@ namespace opt {
     {
         NOL_INSERT("besteffort", "balance with best effort strategy",
                    loba_besteffort);
+        NOL_INSERT("bulk", "A multi-load-units assignation rule without ordering...",
+                   loba_bulk);
         NOL_INSERT("fairstrategy", "balance with fair strategy",
                    loba_fairstrategy);
+        NOL_INSERT("lln", "Balance with less loaded neighbors without ordering-bulk method",
+                   loba_lln);
         NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",
                    loba_makhoul);
         NOL_INSERT("makhoul2", "balance with Makhoul's source code",
@@ -471,7 +477,7 @@ void opt::usage()
               << "minimum duration between comp. iterations"
               << " [" << opt::min_comp_iter_duration << "]\n";
     std::clog << o("-d value")
-              << "start comp. iterations after given number of lb. iterations"
+              << "start comp. iterations after given number of lb. iter."
               << " [" << opt::comp_iter_delay << "]\n";
     std::clog << o("-D value")
               << "start comp. iterations after given time"