Fix typo in help message.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 23783fa5717e277983e199906196d23a0b266e7c..2eb891d60bcdcc066e3af24cd1dd9505f2b72a1c 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -10,8 +10,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 #include "deployment.h"
 #include "process.h"
 
 #include "deployment.h"
 #include "process.h"

+#include "loba_2besteffort.h"

 #include "loba_besteffort.h"
 #include "loba_besteffort.h"

+#include "loba_bulk.h"

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

+#include "loba_lln.h"

 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"
 #include "loba_simple.h"
 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"
 #include "loba_simple.h"


@@ -37,7 +40,7 @@ namespace opt {
 
     // Simulation parameters
     int log_rate = 1;
 
     // 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;
 
     // Platform and deployment
     std::string platform_file;


@@ -59,6 +62,7 @@ namespace opt {
     double min_lb_iter_duration = 1.0;          // fixme: find better defaults
     double min_transfer_amount = 0.0;
     double max_transfer_amount = 0.0;
     double min_lb_iter_duration = 1.0;          // fixme: find better defaults
     double min_transfer_amount = 0.0;
     double max_transfer_amount = 0.0;

+    bool integer_transfer = false;

 
     // Application parameters
     cost_func comp_cost("1e9, 0");              // fixme: find better defaults
 
     // Application parameters
     cost_func comp_cost("1e9, 0");              // fixme: find better defaults


@@ -77,10 +81,16 @@ 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("2besteffort", "balance with best effort strategy (take #2)",
+                   loba_2besteffort);

         NOL_INSERT("besteffort", "balance with best effort strategy",
                    loba_besteffort);
         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("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",
         NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",
                    loba_makhoul);
         NOL_INSERT("makhoul2", "balance with Makhoul's source code",


@@ -215,7 +225,7 @@ bool opt::parse_args(int* argc, char* argv[])
     int c;
     opterr = 0;
     while ((c = getopt(*argc, argv,
     int c;
     opterr = 0;
     while ((c = getopt(*argc, argv,

-                       "a:bc:C:d:D:ehi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:")) != -1) {
+                       "a:bc:C:d:D:ehi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:Z")) != -1) {

         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;


@@ -311,6 +321,9 @@ bool opt::parse_args(int* argc, char* argv[])
             PARSE_ARG(opt::option_x);
             XBT_WARN("option_x set to %d", opt::option_x);
             break;
             PARSE_ARG(opt::option_x);
             XBT_WARN("option_x set to %d", opt::option_x);
             break;

+        case 'Z':
+            opt::integer_transfer = !opt::integer_transfer;
+            break;

         case '?':
             XBT_ERROR("invalid option -- '%c'", optopt);
             result = false;
         case '?':
             XBT_ERROR("invalid option -- '%c'", optopt);
             result = false;


@@ -384,6 +397,8 @@ void opt::print()
     DESCR("minimum data transfer amount", "%g", min_transfer_amount);
     DESCR("maximum data transfer amount", "%s",
           h.val_or_string(max_transfer_amount, "no limit"));
     DESCR("minimum data transfer amount", "%g", min_transfer_amount);
     DESCR("maximum data transfer amount", "%s",
           h.val_or_string(max_transfer_amount, "no limit"));

+    DESCR("only transfer integer data shares", "%s",
+          h.on_off(integer_transfer));

     DESCR("minimum duration between comp. iterations", "%g",
           min_comp_iter_duration);
     DESCR("computations start after lb. iter", "%u", comp_iter_delay);
     DESCR("minimum duration between comp. iterations", "%g",
           min_comp_iter_duration);
     DESCR("computations start after lb. iter", "%u", comp_iter_delay);


@@ -471,7 +486,7 @@ void opt::usage()
               << "minimum duration between comp. iterations"
               << " [" << opt::min_comp_iter_duration << "]\n";
     std::clog << o("-d value")
               << "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"
               << " [" << opt::comp_iter_delay << "]\n";
     std::clog << o("-D value")
               << "start comp. iterations after given time"


@@ -490,6 +505,9 @@ void opt::usage()
     std::clog << o("-M value")
               << "maximum data transfer amount, 0 for no limit"
               << " [" << opt::max_transfer_amount << "]\n";
     std::clog << o("-M value")
               << "maximum data transfer amount, 0 for no limit"
               << " [" << opt::max_transfer_amount << "]\n";

+    std::clog << o("-Z")
+              << "toggle transfer of integer data shares only"
+              << " [" << opt_helper::on_off(opt::integer_transfer) << "]\n";

 
     std::clog << "\nEnd of the simulation:\n";
     std::clog << o("-i value")
 
     std::clog << "\nEnd of the simulation:\n";
     std::clog << o("-i value")