Move options at proper place in switch..case.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 373f4c633504b68fe02a907a9958e37f07fb9fd3..e24e0f97351545386dc5d023d7ce0c440b758256 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -10,6 +10,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 #include "deployment.h"
 #include "process.h"
+#include "loba_2besteffort.h"
 #include "loba_besteffort.h"
 #include "loba_bulk.h"
 #include "loba_fairstrategy.h"
@@ -39,7 +40,7 @@ namespace opt {
 
     // Simulation parameters
     int log_rate = 1;
-    volatile sig_atomic_t exit_request = 0;
+    volatile std::sig_atomic_t exit_request = 0;
 
     // Platform and deployment
     std::string platform_file;
@@ -50,7 +51,7 @@ namespace opt {
         bool        enabled = false;
         std::string topology("clique");
         unsigned    nhosts = 0;
-        double      load = 0.0;
+        double      load = -1.0;
         bool        random_distribution = false;
         unsigned long random_seed = 0;
     }
@@ -61,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;
+    bool integer_transfer = false;
 
     // Application parameters
     cost_func comp_cost("1e9, 0");              // fixme: find better defaults
@@ -79,6 +81,8 @@ namespace opt {
     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("bulk", "A multi-load-units assignation rule without ordering...",
@@ -221,7 +225,7 @@ bool opt::parse_args(int* argc, char* 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;
@@ -233,12 +237,6 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'b':
             opt::bookkeeping = !opt::bookkeeping;
             break;
-        case 'e':
-            opt::exit_on_close = !opt::exit_on_close;
-            break;
-        case 'h':
-            opt::help_requested++;
-            break;
         case 'c':
             try {
                 opt::comp_cost = cost_func(optarg);
@@ -263,6 +261,12 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'D':
             PARSE_ARG(opt::comp_time_delay);
             break;
+        case 'e':
+            opt::exit_on_close = !opt::exit_on_close;
+            break;
+        case 'h':
+            opt::help_requested++;
+            break;
         case 'i':
             PARSE_ARG(opt::lb_maxiter);
             break;
@@ -317,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;
+        case 'Z':
+            opt::integer_transfer = !opt::integer_transfer;
+            break;
         case '?':
             XBT_ERROR("invalid option -- '%c'", optopt);
             result = false;
@@ -372,8 +379,10 @@ void opt::print()
         DESCR("- topology", "%s", auto_depl::topology.c_str());
         DESCR("- number of hosts", "%s", h.val_or_string(auto_depl::nhosts,
                                                          "auto"));
-        DESCR("- initial load", "%s", h.val_or_string(auto_depl::load,
-                                                      "auto"));
+        if (auto_depl::load < 0.0)
+            DESCR("- initial load (average)", "%g", -auto_depl::load);
+        else
+            DESCR("- initial load (total)", "%g", auto_depl::load);
         DESCR("- random initial load distribution", "%s",
               h.on_off(auto_depl::random_distribution));
         DESCR("- random seed", "%s",
@@ -390,6 +399,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("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);
@@ -448,7 +459,7 @@ void opt::usage()
     if (opt::help_requested > 1)
         so_list(opt::topologies);
     std::clog << o("-L value")
-              << "total load with auto deployment, 0 for number of hosts"
+              << "total load with auto deployment, average if negative"
               << " [" << opt::auto_depl::load << "]\n";
     std::clog << o("-N value")
               << "number of hosts to use with auto deployment, 0 for max."
@@ -496,6 +507,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("-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")