X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/99ec08fb32d4b65c88628e45f9ebdb26741b9674..25ada1b3a5e1a439e4f2468094c3397f78fe9471:/options.cpp

diff --git a/options.cpp b/options.cpp
index 1a3db2c..2509fe0 100644
--- a/options.cpp
+++ b/options.cpp
@@ -11,6 +11,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "process.h"
 #include "loba_simple.h"
 #include "loba_fairstrategy.h"
+#include "loba_makhoul.h"
+#include "misc.h"
 
 #include "options.h"
 
@@ -49,20 +51,22 @@ namespace opt {
     // Application parameters
     // fixme: find better defaults
     cost_func comp_cost("1e9, 0");
-    cost_func comm_cost("1, 0");
-    double min_iter_duration = 1.0;
+    cost_func comm_cost("1e6, 0");
+    double min_lb_iter_duration = 1.0;
+    double min_comp_iter_duration = 1.0;
 
     // Parameters for the end of the simulation
-    // fixme: find better defaults
-    unsigned comp_maxiter = 10;
-    unsigned lb_maxiter = comp_maxiter;
-    bool exit_on_close = false;
+    unsigned lb_maxiter = 0;
+    unsigned comp_maxiter = 0;
+    double time_limit = 0;
+    bool exit_on_close = true;
 
     // Named parameters lists
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
         NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
+        NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm", loba_makhoul);
         NOL_INSERT("none", "no load-balancing (for testing only)", process);
         NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }
@@ -148,18 +152,18 @@ bool opt_helper::nol_find_prefix(const T& nol, const char* descr,
         }
         switch (candidates.size()) {
         case 0:
-            ERROR2("unknownw %s -- %s", descr, name.c_str());
+            XBT_ERROR("unknownw %s -- %s", descr, name.c_str());
             break;
         case 1:
             name = candidates.top();
             candidates.pop();
             result = true;
-            DEBUG2("infered %s -- %s", descr, name.c_str());
+            XBT_DEBUG("infered %s -- %s", descr, name.c_str());
             break;
         default:
-            ERROR2("ambiguous %s -- %s", descr, name.c_str());
+            XBT_ERROR("ambiguous %s -- %s", descr, name.c_str());
             while (!candidates.empty()) {
-                ERROR1("  candidates are -- %s", candidates.top().c_str());
+                XBT_ERROR("  candidates are -- %s", candidates.top().c_str());
                 candidates.pop();
             }
             break;
@@ -177,7 +181,7 @@ bool opt::parse_args(int* argc, char* argv[])
     
     int c;
     opterr = 0;
-    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:T:vV")) != -1) {
+    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:S:t:T:vV")) != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
@@ -187,10 +191,10 @@ bool opt::parse_args(int* argc, char* argv[])
                 && result;
             break;
         case 'b':
-            opt::bookkeeping = true;
+            opt::bookkeeping = !opt::bookkeeping;
             break;
         case 'e':
-            opt::exit_on_close = true;
+            opt::exit_on_close = !opt::exit_on_close;
             break;
         case 'h':
             opt::help_requested++;
@@ -202,12 +206,10 @@ bool opt::parse_args(int* argc, char* argv[])
             opt::comm_cost = cost_func(optarg);
             break;
         case 'i':
-            std::istringstream(optarg) >> opt::comp_maxiter;
+            std::istringstream(optarg) >> opt::lb_maxiter;
             break;
         case 'I':
-            std::istringstream(optarg) >> opt::lb_maxiter;
-            ERROR0("option -I not implemented yet");
-            result = false;
+            std::istringstream(optarg) >> opt::comp_maxiter;
             break;
         case 'l':
             std::istringstream(optarg) >> opt::log_rate;
@@ -219,7 +221,13 @@ bool opt::parse_args(int* argc, char* argv[])
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
         case 's':
-            std::istringstream(optarg) >> opt::min_iter_duration;
+            std::istringstream(optarg) >> opt::min_lb_iter_duration;
+            break;
+        case 'S':
+            std::istringstream(optarg) >> opt::min_comp_iter_duration;
+            break;
+        case 't':
+            std::istringstream(optarg) >> opt::time_limit;
             break;
         case 'T':
             opt::auto_depl::topology = optarg;
@@ -235,7 +243,7 @@ bool opt::parse_args(int* argc, char* argv[])
             opt::version_requested = true;
             break;
         case '?':
-            ERROR1("invalid option -- '%c'", optopt);
+            XBT_ERROR("invalid option -- '%c'", optopt);
             result = false;
             break;
         }
@@ -247,7 +255,7 @@ bool opt::parse_args(int* argc, char* argv[])
     if (optind < *argc) {
         opt::platform_file = argv[optind++];
     } else {
-        ERROR0("missing parameter -- <plaform_file>");
+        XBT_ERROR("missing parameter -- <plaform_file>");
         result = false;
     }
     if (optind < *argc) {
@@ -256,7 +264,7 @@ bool opt::parse_args(int* argc, char* argv[])
     opt::auto_depl::enabled = opt::deployment_file.empty();
 
     while (optind < *argc) {
-        ERROR1("unused parameter -- \"%s\"", argv[optind++]);
+        XBT_ERROR("unused parameter -- \"%s\"", argv[optind++]);
         result = false;
     }
 
@@ -268,13 +276,13 @@ void opt::print()
     opt_helper h;
 
 #define DESCR(description, format, value) \
-    INFO2("| %s: " format, h.descr(description), value)
+    XBT_INFO("| %s: " format, h.descr(description), value)
 
-    INFO0(",----[ Simulation parameters ]");
+    XBT_INFO(",----[ Simulation parameters ]");
     DESCR("log rate", "%s", h.val_or_string(log_rate, "disabled"));
     DESCR("platform file", "\"%s\"", platform_file.c_str());
     if (auto_depl::enabled) {
-        INFO0("| automatic deployment enabled");
+        XBT_INFO("| automatic deployment enabled");
         DESCR("- topology", "%s", auto_depl::topology.c_str());
         DESCR("- number of hosts", "%s", h.val_or_string(auto_depl::nhosts,
                                                          "auto"));
@@ -287,13 +295,17 @@ void opt::print()
     DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
     DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
     DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
-    DESCR("minimum duration between iterations", "%g", min_iter_duration);
-    DESCR("maximum number of comp. iterations", "%s",
-          h.val_or_string(comp_maxiter, "infinity"));
+    DESCR("minimum duration between lb. iterations", "%g",
+          min_lb_iter_duration);
+    DESCR("minimum duration between comp. iterations", "%g",
+          min_comp_iter_duration);
     DESCR("maximum number of lb. iterations", "%s",
           h.val_or_string(lb_maxiter, "infinity"));
+    DESCR("maximum number of comp. iterations", "%s",
+          h.val_or_string(comp_maxiter, "infinity"));
+    DESCR("time limit", "%s", h.val_or_string(time_limit, "infinity"));
     DESCR("exit on close", "%s", h.on_off(exit_on_close));
-    INFO0("`----");
+    XBT_INFO("`----");
 
 #undef DESCR
 }
@@ -328,50 +340,58 @@ void opt::usage()
 
     std::clog << "\nSimulation parameters\n";
     std::clog << o("-l value")
-              << "print current load every n-th iterations, 0 to disable"
-              << " (" << opt::log_rate << ")\n";
+              << "print current load every n lb iterations, 0 to disable"
+              << " [" << opt::log_rate << "]\n";
     std::clog << o("-v")
               << "verbose: do not override the default logging parameters\n";
 
     std::clog << "\nAutomatic deployment options\n";
     std::clog << o("-T name")
               << "enable automatic deployment with selected topology"
-              << " (" << opt::auto_depl::topology << ")\n";
+              << " [" << opt::auto_depl::topology << "]\n";
     if (opt::help_requested > 1)
         so_list(opt::topologies);
     std::clog << o("-L value")
               << "total load with auto deployment, 0 for number of hosts"
-              << " (" << opt::auto_depl::load << ")\n";
+              << " [" << opt::auto_depl::load << "]\n";
     std::clog << o("-N value")
-              << "number of hosts to use with auto deployment,"
-              << " 0 for max. (" << opt::auto_depl::nhosts << ")\n";
+              << "number of hosts to use with auto deployment, 0 for max."
+              << " [" << opt::auto_depl::nhosts << "]\n";
 
     std::clog << "\nLoad balancing algorithm\n";
     std::clog << o("-a name") << "load balancing algorithm"
-              << " (" << opt::loba_algo << ")\n";
+              << " [" << opt::loba_algo << "]\n";
     if (opt::help_requested > 1)
         so_list(opt::loba_algorithms);
-    std::clog << o("-b") << "enable bookkeeping (\"virtual load\")\n";
+    std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")"
+              << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
 
     std::clog << "\nApplication parameters\n";
-    std::clog << o("-c [fn,...]f0")
+    std::clog << o("-c [aN,...]a0")
               << "polynomial factors for computation cost"
-              << " (" << opt::comp_cost.to_string() << ")\n";
-    std::clog << o("-C [fn,...]f0")
+              << " [" << opt::comp_cost.to_string() << "]\n";
+    std::clog << o("-C [aN,...]a0")
               << "polynomial factors for communication cost"
-              << " (" << opt::comm_cost.to_string() << ")\n";
+              << " [" << opt::comm_cost.to_string() << "]\n";
     std::clog << o("-s value")
-              << "minimum duration between iterations"
-              << " (" << opt::min_iter_duration << ")\n";
+              << "minimum duration between lb. iterations"
+              << " [" << opt::min_lb_iter_duration << "]\n";
+    std::clog << o("-S value")
+              << "minimum duration between comp. iterations"
+              << " [" << opt::min_comp_iter_duration << "]\n";
 
     std::clog << "\nParameters for the end of the simulation\n";
     std::clog << o("-i value")
-              << "maximum number of comp. iterations, 0 for infinity"
-              << " (" << opt::comp_maxiter << ")\n";
-    std::clog << o("-I value")
               << "maximum number of lb. iterations, 0 for infinity"
-              << " (" << opt::lb_maxiter << ")\n";
-    std::clog << o("-e") << "exit on reception of \"close\" message\n";
+              << " [" << opt::lb_maxiter << "]\n";
+    std::clog << o("-I value")
+              << "maximum number of comp. iterations, 0 for infinity"
+              << " [" << opt::comp_maxiter << "]\n";
+    std::clog << o("-t value")
+              << "time limit (simulated time), 0 for infinity"
+              << " [" << opt::time_limit << "]\n";
+    std::clog << o("-e") << "toggle exit on reception of \"close\" message"
+              << " [" << opt_helper::on_off(opt::exit_on_close) << "]\n";
 
     if (opt::help_requested < 3)
         return;