X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/5c7c048885373897b33b2761df42444eb5b24640..9ec598fc7b8d73ed8e9822aed084ad1e1b2918b6:/options.cpp

diff --git a/options.cpp b/options.cpp
index 56049ed..dc29495 100644
--- a/options.cpp
+++ b/options.cpp
@@ -7,6 +7,8 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
+#include "deployment.h"
+#include "process.h"
 #include "loba_simple.h"
 #include "loba_fairstrategy.h"
 
@@ -45,10 +47,16 @@ namespace opt {
     bool bookkeeping = false;
 
     // Application parameters
-    cost_func comp_cost("1e9, 0"); // fixme: find better defaults
-    cost_func comm_cost("1, 0"); // fixme: find better defaults
-    unsigned comp_maxiter = 10;  // fixme: find better defaults
-    unsigned lb_maxiter = comp_maxiter; // fixme: find better defaults
+    // fixme: find better defaults
+    cost_func comp_cost("1e9, 0");
+    cost_func comm_cost("1, 0");
+    double min_iter_duration = 1.0;
+
+    // Parameters for the end of the simulation
+    // fixme: find better defaults
+    unsigned comp_maxiter = 10;
+    unsigned lb_maxiter = comp_maxiter;
+    double time_limit = 0;
     bool exit_on_close = false;
 
     // Named parameters lists
@@ -105,7 +113,7 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
-    const int descr_width = 35;
+    const int descr_width = 40;
     std::string& res = descr_str;
     res = str;
     res.resize(descr_width, '.');
@@ -170,7 +178,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:T:vV")) != -1) {
+    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:t:T:vV")) != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
@@ -211,6 +219,12 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'N':
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
+        case 's':
+            std::istringstream(optarg) >> opt::min_iter_duration;
+            break;
+        case 't':
+            std::istringstream(optarg) >> opt::time_limit;
+            break;
         case 'T':
             opt::auto_depl::topology = optarg;
             result = opt_helper::nol_find_prefix(opt::topologies, "topology",
@@ -261,27 +275,29 @@ void opt::print()
     INFO2("| %s: " format, h.descr(description), value)
 
     INFO0(",----[ Simulation parameters ]");
-    DESCR("log rate", "%s",          h.val_or_string(log_rate, "disabled"));
+    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");
-        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"));
+        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"));
     } 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("computation cost factors", "[%s]",   comp_cost.to_string().c_str());
+    DESCR("load balancing algorithm", "%s", loba_algo.c_str());
+    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("maximum number of lb. iterations", "%s",
           h.val_or_string(lb_maxiter, "infinity"));
-    DESCR("exit on close", "%s",                h.on_off(exit_on_close));
+    DESCR("time limit", "%s", h.val_or_string(time_limit, "infinity"));
+    DESCR("exit on close", "%s", h.on_off(exit_on_close));
     INFO0("`----");
 
 #undef DESCR
@@ -340,7 +356,7 @@ void opt::usage()
               << " (" << opt::loba_algo << ")\n";
     if (opt::help_requested > 1)
         so_list(opt::loba_algorithms);
-    std::clog << o("-b") << "enable bookkeeping\n";
+    std::clog << o("-b") << "enable bookkeeping (\"virtual load\")\n";
 
     std::clog << "\nApplication parameters\n";
     std::clog << o("-c [fn,...]f0")
@@ -349,13 +365,21 @@ void opt::usage()
     std::clog << o("-C [fn,...]f0")
               << "polynomial factors for communication cost"
               << " (" << opt::comm_cost.to_string() << ")\n";
-    std::clog << o("-e") << "exit on reception of \"close\" message\n";
+    std::clog << o("-s value")
+              << "minimum duration between iterations"
+              << " (" << opt::min_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("-t value")
+              << "time limit (simulated time), 0 for infinity"
+              << " (" << opt::time_limit << ")\n";
+    std::clog << o("-e") << "exit on reception of \"close\" message\n";
 
     if (opt::help_requested < 3)
         return;
@@ -371,6 +395,8 @@ void opt::usage()
               << "        proc : messages from base process class\n"
               << "        loba : messages from load-balancer\n";
 
+    // std::clog << "\nMiscellaneous low-level parameters\n";
+
 #undef so_list
 #undef so
 #undef o