Update copyright in version string, and other cosmetic changes.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 827a064935cfa4d2fdeb4572e258c5d22a100d18..6a6a8872f5dbb4a646d9518603d55ea01741f629 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -7,6 +7,8 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 

+#include "deployment.h"
+#include "process.h"

 #include "loba_simple.h"
 #include "loba_fairstrategy.h"
 
 #include "loba_simple.h"
 #include "loba_fairstrategy.h"
 


@@ -45,10 +47,14 @@ namespace opt {
     bool bookkeeping = false;
 
     // Application parameters
     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");
+
+    // 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;
 
     // Named parameters lists
     bool exit_on_close = false;
 
     // Named parameters lists


@@ -176,7 +182,8 @@ bool opt::parse_args(int* argc, char* argv[])
             opt::loba_algo = optarg;
             result = opt_helper::nol_find_prefix(opt::loba_algorithms,
                                                  "load balancing algorithm",
             opt::loba_algo = optarg;
             result = opt_helper::nol_find_prefix(opt::loba_algorithms,
                                                  "load balancing algorithm",

-                                                 opt::loba_algo);
+                                                 opt::loba_algo)
+                && result;

             break;
         case 'b':
             opt::bookkeeping = true;
             break;
         case 'b':
             opt::bookkeeping = true;


@@ -213,7 +220,8 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'T':
             opt::auto_depl::topology = optarg;
             result = opt_helper::nol_find_prefix(opt::topologies, "topology",
         case 'T':
             opt::auto_depl::topology = optarg;
             result = opt_helper::nol_find_prefix(opt::topologies, "topology",

-                                                 opt::auto_depl::topology);
+                                                 opt::auto_depl::topology)
+                && result;

             break;
         case 'v':
             // nothing to do: this option is checked at the very
             break;
         case 'v':
             // nothing to do: this option is checked at the very


@@ -259,27 +267,27 @@ void opt::print()
     INFO2("| %s: " format, h.descr(description), value)
 
     INFO0(",----[ Simulation parameters ]");
     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("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());
     }
     } 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("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("communication cost factors", "[%s]", comm_cost.to_string().c_str());
     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("exit on close", "%s", h.on_off(exit_on_close));

     INFO0("`----");
 
 #undef DESCR
     INFO0("`----");
 
 #undef DESCR


@@ -338,7 +346,7 @@ void opt::usage()
               << " (" << opt::loba_algo << ")\n";
     if (opt::help_requested > 1)
         so_list(opt::loba_algorithms);
               << " (" << 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")
 
     std::clog << "\nApplication parameters\n";
     std::clog << o("-c [fn,...]f0")


@@ -347,13 +355,15 @@ void opt::usage()
     std::clog << o("-C [fn,...]f0")
               << "polynomial factors for communication cost"
               << " (" << opt::comm_cost.to_string() << ")\n";
     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 << "\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("-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";

 
     if (opt::help_requested < 3)
         return;
 
     if (opt::help_requested < 3)
         return;


@@ -369,6 +379,8 @@ void opt::usage()
               << "        proc : messages from base process class\n"
               << "        loba : messages from load-balancer\n";
 
               << "        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
 #undef so_list
 #undef so
 #undef o