X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/d4fbe175e440c3e9de9b5468b85bf56daab62bff..d79c6aa768cb68806408632c832e5e1330e451a6:/options.cpp

diff --git a/options.cpp b/options.cpp
index fd9da4e..cf9bb0f 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"
 
@@ -28,7 +30,7 @@ namespace opt {
     bool version_requested = false;
 
     // Simulation parameters
-    unsigned log_rate = 1;
+    int log_rate = 1;
 
     // Platform and deployment
     std::string platform_file;
@@ -49,8 +51,9 @@ 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
     unsigned lb_maxiter = 0;
@@ -63,6 +66,7 @@ namespace opt {
     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);
     }
@@ -89,6 +93,8 @@ namespace {
     // local helper class
     class opt_helper {
     public:
+        template <typename T>
+        static bool parse_arg(char opt, const char *arg, T& val);
         static const char* on_off(bool b);
         const char* descr(const char* str);
         template <typename T>
@@ -105,6 +111,16 @@ namespace {
 
 } // namespace
 
+template <typename T>
+bool opt_helper::parse_arg(char opt, const char *arg, T& val)
+{
+    std::istringstream str(arg);
+    bool result = (str >> val) && str.eof();
+    if (!result)
+        XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", opt, arg);
+    return result;
+}
+
 const char* opt_helper::on_off(bool b)
 {
     return b ? "on" : "off";
@@ -148,18 +164,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;
@@ -174,10 +190,12 @@ bool opt::parse_args(int* argc, char* argv[])
 
     opt::program_name = argv[0];
     opt::program_name.erase(0, 1 + opt::program_name.find_last_of('/'));
+
+#define PARSE_ARG(x) result = opt_helper::parse_arg(c, optarg, (x)) && result
     
     int c;
     opterr = 0;
-    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:t: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;
@@ -196,31 +214,44 @@ bool opt::parse_args(int* argc, char* argv[])
             opt::help_requested++;
             break;
         case 'c':
-            opt::comp_cost = cost_func(optarg);
+            try {
+                opt::comp_cost = cost_func(optarg);
+            } catch (...) {
+                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+                result = false;
+            }
             break;
         case 'C':
-            opt::comm_cost = cost_func(optarg);
+            try {
+                opt::comm_cost = cost_func(optarg);
+            } catch (...) {
+                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+                result = false;
+            }
             break;
         case 'i':
-            std::istringstream(optarg) >> opt::lb_maxiter;
+            PARSE_ARG(opt::lb_maxiter);
             break;
         case 'I':
-            std::istringstream(optarg) >> opt::comp_maxiter;
+            PARSE_ARG(opt::comp_maxiter);
             break;
         case 'l':
-            std::istringstream(optarg) >> opt::log_rate;
+            PARSE_ARG(opt::log_rate);
             break;
         case 'L':
-            std::istringstream(optarg) >> opt::auto_depl::load;
+            PARSE_ARG(opt::auto_depl::load);
             break;
         case 'N':
-            std::istringstream(optarg) >> opt::auto_depl::nhosts;
+            PARSE_ARG(opt::auto_depl::nhosts);
             break;
         case 's':
-            std::istringstream(optarg) >> opt::min_iter_duration;
+            PARSE_ARG(opt::min_lb_iter_duration);
+            break;
+        case 'S':
+            PARSE_ARG(opt::min_comp_iter_duration);
             break;
         case 't':
-            std::istringstream(optarg) >> opt::time_limit;
+            PARSE_ARG(opt::time_limit);
             break;
         case 'T':
             opt::auto_depl::topology = optarg;
@@ -236,19 +267,21 @@ 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;
         }
     }
 
+#undef PARSE_ARG
+
     if (opt::version_requested || opt::help_requested)
         return 1;
 
     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) {
@@ -257,7 +290,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;
     }
 
@@ -269,13 +302,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"));
@@ -288,14 +321,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("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
 }
@@ -357,15 +393,18 @@ void opt::usage()
               << " [" << 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")
+    std::clog << o("-C [aN,...]a0")
               << "polynomial factors for communication cost"
               << " [" << 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")
@@ -392,7 +431,8 @@ void opt::usage()
               << "        depl : messages from auto deployment (inherited from main)\n"
               << "        comm : messages from asynchronous pipes\n"
               << "        proc : messages from base process class\n"
-              << "        loba : messages from load-balancer\n";
+              << "        loba : messages from load-balancer\n"
+              << "        thrd : messages from thread wrapper class\n";
 
     // std::clog << "\nMiscellaneous low-level parameters\n";