Fix build with SimGrid 3.12.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 482d486fed7d880ca70cbae23ab02190b506642a..b31888f90f13b0b2b96e99c12687ffdbfae923e0 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -37,7 +37,8 @@ namespace opt {
     std::string program_name;
     int help_requested = 0;
     bool version_requested = false;
     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;
 
     // Simulation parameters
     int log_rate = 1;


@@ -65,6 +66,7 @@ namespace opt {
     double min_transfer_amount = 0.0;
     double max_transfer_amount = 0.0;
     bool integer_transfer = false;
     double min_transfer_amount = 0.0;
     double max_transfer_amount = 0.0;
     bool integer_transfer = false;

+    unsigned loba_best_divisor = 1;

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


@@ -74,9 +76,11 @@ namespace opt {
     double comp_time_delay = 0.0;               // fixme: find better defaults
 
     // Parameters for the end of the simulation
     double comp_time_delay = 0.0;               // fixme: find better defaults
 
     // Parameters for the end of the simulation

+    double avg_load_ratio = 0.0;

     unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;
     unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;

+    unsigned exit_on_convergence = 0;

     bool exit_on_close = true;
 
     // Named parameters lists
     bool exit_on_close = true;
 
     // Named parameters lists


@@ -97,7 +101,7 @@ namespace opt {
                    loba_makhoul);
         NOL_INSERT("makhoul2", "balance with Makhoul's source code",
                    loba_makhoul2);
                    loba_makhoul);
         NOL_INSERT("makhoul2", "balance with Makhoul's source code",
                    loba_makhoul2);

-        NOL_INSERT("makhoul3", "describe your algorithm here...",
+        NOL_INSERT("makhoul3", "variation on Makhoul's algorithm",

                    loba_makhoul3);
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);
                    loba_makhoul3);
         NOL_INSERT("none", "no load-balancing (for testing only)",
                    process);


@@ -162,25 +166,24 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
 
 const char* opt_helper::descr(const char* str)
 {

-    std::string& res = descr_str;
-    res = str;
-    res.resize(DATA_DESCR_WIDTH, '.');
-    return res.c_str();
+    descr_str = str;
+    descr_str.push_back(' ');
+    descr_str.resize(DATA_DESCR_WIDTH, '.');
+    return descr_str.c_str();

 }
 
 template <typename T>
 const char* opt_helper::val_or_string(const T& val, const char* str,
                                       const T& deflt)
 {
 }
 
 template <typename T>
 const char* opt_helper::val_or_string(const T& val, const char* str,
                                       const T& deflt)
 {

-    std::string& res = val_or_string_str;

     if (val != deflt) {
         std::ostringstream oss;
         oss << val;
     if (val != deflt) {
         std::ostringstream oss;
         oss << val;

-        res = oss.str();
+        val_or_string_str = oss.str();

     } else {
     } else {

-        res = str;
+        val_or_string_str = str;

     }
     }

-    return res.c_str();
+    return val_or_string_str.c_str();

 }
 
 template <typename T>
 }
 
 template <typename T>


@@ -229,8 +232,13 @@ 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:eEhi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:Z")) != -1) {
+                       "%:"
+                       "a:bc:C:d:D:eEg:hi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
+           != -1) {

         switch (c) {
         switch (c) {

+        case '%':
+            PARSE_ARG(opt::avg_load_ratio);
+            break;

         case 'a':
             opt::loba_algo = optarg;
             result = opt_helper::nol_find_prefix(opt::loba_algorithms,
         case 'a':
             opt::loba_algo = optarg;
             result = opt_helper::nol_find_prefix(opt::loba_algorithms,


@@ -271,12 +279,18 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'E':
             opt::egocentric = !opt::egocentric;
             break;
         case 'E':
             opt::egocentric = !opt::egocentric;
             break;

+        case 'g':
+            PARSE_ARG(opt::exit_on_convergence);
+            break;

         case 'h':
             opt::help_requested++;
             break;
         case 'i':
             PARSE_ARG(opt::lb_maxiter);
             break;
         case 'h':
             opt::help_requested++;
             break;
         case 'i':
             PARSE_ARG(opt::lb_maxiter);
             break;

+        case 'k':
+            PARSE_ARG(opt::loba_best_divisor);
+            break;

         case 'I':
             PARSE_ARG(opt::comp_maxiter);
             break;
         case 'I':
             PARSE_ARG(opt::comp_maxiter);
             break;


@@ -328,6 +342,10 @@ 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 '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 'Z':
             opt::integer_transfer = !opt::integer_transfer;
             break;


@@ -361,7 +379,15 @@ bool opt::parse_args(int* argc, char* argv[])
 
     if (opt::max_transfer_amount &&
         opt::max_transfer_amount < opt::min_transfer_amount) {
 
     if (opt::max_transfer_amount &&
         opt::max_transfer_amount < opt::min_transfer_amount) {

-        XBT_ERROR("max. data transfer amount < min. data transfer amount");
+        XBT_ERROR("max. data transfer amount (%g) <"
+                  " min. data transfer amount (%g)",
+                  opt::max_transfer_amount, opt::min_transfer_amount);
+        result = false;
+    }
+
+    if (opt::loba_best_divisor <= 0) {
+        XBT_ERROR("divisor for algorithms *best* (%u) should be positive",
+                  opt::loba_best_divisor);

         result = false;
     }
 
         result = false;
     }
 


@@ -392,16 +418,14 @@ void opt::print()
             DESCR("- initial load (total)", "%g", auto_depl::load);
         DESCR("- random initial load distribution", "%s",
               h.on_off(auto_depl::random_distribution));
             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",
-              h.val_or_string(auto_depl::random_seed, "time based"));
+        DESCR("- random seed", "%s", // NOTE: cannot be 0 here anymore
+              h.val_or_string(auto_depl::random_seed, "constant random", 1UL));

     } else {
         DESCR("deployment file", "\"%s\"", deployment_file.c_str());
     }
     DESCR("load balancing algorithm", "%s", loba_algo.c_str());
     DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
     DESCR("egocentric mode", "%s", h.on_off(egocentric));
     } else {
         DESCR("deployment file", "\"%s\"", deployment_file.c_str());
     }
     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());
     DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
     DESCR("minimum data transfer amount", "%g", min_transfer_amount);
     DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
     DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
     DESCR("minimum data transfer amount", "%g", min_transfer_amount);


@@ -409,6 +433,9 @@ void opt::print()
           h.val_or_string(max_transfer_amount, "no limit"));
     DESCR("only transfer integer data shares", "%s",
           h.on_off(integer_transfer));
           h.val_or_string(max_transfer_amount, "no limit"));
     DESCR("only transfer integer data shares", "%s",
           h.on_off(integer_transfer));

+    DESCR("divisor for algorithms *best*", "%u", loba_best_divisor);
+    DESCR("minimum duration between lb. iterations", "%g",
+          min_lb_iter_duration);

     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);


@@ -417,7 +444,10 @@ void opt::print()
           h.val_or_string(lb_maxiter, "no limit"));
     DESCR("maximum number of comp. iterations", "%s",
           h.val_or_string(comp_maxiter, "no limit"));
           h.val_or_string(lb_maxiter, "no limit"));
     DESCR("maximum number of comp. iterations", "%s",
           h.val_or_string(comp_maxiter, "no limit"));

+    DESCR("convergence is assumed within (\%)", "%g", opt::avg_load_ratio);

     DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));
     DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));

+    DESCR("exit on convergence", "%s",
+          h.val_or_string(exit_on_convergence, "disabled"));

     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     XBT_INFO("`----");
 
     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     XBT_INFO("`----");
 


@@ -477,8 +507,11 @@ void opt::usage()
               << " [" << opt_helper::on_off(opt::auto_depl::random_distribution)
               << "]\n";
     std::clog << o("-r value")
               << " [" << opt_helper::on_off(opt::auto_depl::random_distribution)
               << "]\n";
     std::clog << o("-r value")

-              << "random seed, 0 for a seed based on current date"
+              << "random seed for initial load distribution, or 0, or 1"

               << " [" << opt::auto_depl::random_seed << "]\n";
               << " [" << opt::auto_depl::random_seed << "]\n";

+    if (opt::help_requested > 1)
+        std::clog << o("") << "- use 0 for a seed based on current date\n"
+                  << o("") << "- use 1 for a constant random\n";

 
     std::clog << "\nLoad balancing algorithm:\n";
     std::clog << o("-a name") << "load balancing algorithm"
 
     std::clog << "\nLoad balancing algorithm:\n";
     std::clog << o("-a name") << "load balancing algorithm"


@@ -492,6 +525,8 @@ void opt::usage()
     if (opt::help_requested > 1)
         std::clog << o("")
                   << "(a not so good idea introduced by git commit f5336c5)\n";
     if (opt::help_requested > 1)
         std::clog << o("")
                   << "(a not so good idea introduced by git commit f5336c5)\n";

+    std::clog << o("-k value") << "divisor for algorithms *best*"
+              << " [" << opt::loba_best_divisor << "]\n";

 
     std::clog << "\nLb. and comp. iterations:\n";
     std::clog << o("-s value")
 
     std::clog << "\nLb. and comp. iterations:\n";
     std::clog << o("-s value")


@@ -531,6 +566,18 @@ void opt::usage()
     std::clog << o("-I value")
               << "maximum number of comp. iterations, 0 for no limit"
               << " [" << opt::comp_maxiter << "]\n";
     std::clog << o("-I value")
               << "maximum number of comp. iterations, 0 for no limit"
               << " [" << opt::comp_maxiter << "]\n";

+    std::clog << o("-% value")
+              << "percent of the load average to assume the convergence"
+              << " [" << opt::avg_load_ratio << "]\n";
+    if (opt::help_requested > 1)
+        std::clog << o("")
+                  << "- if negative: use 100 * (nhosts / -value) / avg_load\n";
+    std::clog << o("-g value")
+              << "number of consecutive detections of convergence to exit"
+              << " [" << opt::exit_on_convergence << "]\n";
+    if (opt::help_requested > 1)
+        std::clog << o("")
+                  << "- use 0 to disable\n";

     std::clog << o("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";
     std::clog << o("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";


@@ -540,6 +587,12 @@ void opt::usage()
     if (opt::help_requested < 3)
         return;
 
     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"
     std::clog << "\nLogging support:\n"
               << "    See SimGrid documentation on:\n"
               << "        http://simgrid.gforge.inria.fr/doc/group__XBT__log.html#log_user\n"