X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/80a1fe1a200a4309c36598571b1f4ccb76a8788f..ada04f5ebefdfe318749f9ede9ea4bb0de2f0f7c:/options.cpp?ds=sidebyside

diff --git a/options.cpp b/options.cpp
index 3eed8a2..a943339 100644
--- a/options.cpp
+++ b/options.cpp
@@ -10,12 +10,14 @@ 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"
 #include "loba_lln.h"
 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"
+#include "loba_makhoul3.h"
 #include "loba_simple.h"
 #include "misc.h"
 
@@ -35,7 +37,8 @@ namespace opt {
     std::string program_name;
     int help_requested = 0;
     bool version_requested = false;
-    int option_x = 0;           // hidden option, for debugging purpose
+    int option_x = 0;           // hidden option (int)
+    double option_X = 0.0;      // hidden option (double)
 
     // Simulation parameters
     int log_rate = 1;
@@ -50,7 +53,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;
     }
@@ -58,9 +61,11 @@ namespace opt {
     // Load balancing algorithm
     std::string loba_algo("simple");
     bool bookkeeping = false;
+    bool egocentric = false;
     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,18 +84,22 @@ 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...",
+        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",
+        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",
                    loba_makhoul2);
+        NOL_INSERT("makhoul3", "variation on Makhoul's algorithm",
+                   loba_makhoul3);
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);
         NOL_INSERT("simple", "balance with least loaded neighbor",
@@ -221,7 +230,8 @@ 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:eEhi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
+           != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
@@ -233,12 +243,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 +267,15 @@ 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 'E':
+            opt::egocentric = !opt::egocentric;
+            break;
+        case 'h':
+            opt::help_requested++;
+            break;
         case 'i':
             PARSE_ARG(opt::lb_maxiter);
             break;
@@ -317,6 +330,13 @@ 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 'X':
+            PARSE_ARG(opt::option_X);
+            XBT_WARN("option_X set to %g", opt::option_X);
+            break;
+        case 'Z':
+            opt::integer_transfer = !opt::integer_transfer;
+            break;
         case '?':
             XBT_ERROR("invalid option -- '%c'", optopt);
             result = false;
@@ -372,8 +392,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",
@@ -383,6 +405,7 @@ void opt::print()
     }
     DESCR("load balancing algorithm", "%s", loba_algo.c_str());
     DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
+    DESCR("egocentric mode", "%s", h.on_off(egocentric));
     DESCR("minimum duration between lb. iterations", "%g",
           min_lb_iter_duration);
     DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
@@ -390,6 +413,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 +473,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."
@@ -468,6 +493,11 @@ void opt::usage()
         so_list(opt::loba_algorithms);
     std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")"
               << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
+    std::clog << o("-E") << "toggle egocentric mode when bookkeeping"
+              << " [" << opt_helper::on_off(opt::egocentric) << "]\n";
+    if (opt::help_requested > 1)
+        std::clog << o("")
+                  << "(a not so good idea introduced by git commit f5336c5)\n";
 
     std::clog << "\nLb. and comp. iterations:\n";
     std::clog << o("-s value")
@@ -496,6 +526,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")
@@ -513,6 +546,12 @@ void opt::usage()
     if (opt::help_requested < 3)
         return;
 
+    std::clog << "\nHidden options:\n";
+    std::clog << o("-x value") << "value is an integer"
+              << " [" << opt::option_x << "]\n";
+    std::clog << o("-X value") << "value is a real number"
+              << " [" << opt::option_X << "]\n";
+
     std::clog << "\nLogging support:\n"
               << "    See SimGrid documentation on:\n"
               << "        http://simgrid.gforge.inria.fr/doc/group__XBT__log.html#log_user\n"