Update BUGS.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 78612a127b26b0c365ba13b540e60723e0fe2b1f..3eed8a259731798ba790f1c59eafad44798b01fc 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -13,6 +13,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "loba_besteffort.h"
 #include "loba_bulk.h"
 #include "loba_fairstrategy.h"
+#include "loba_lln.h"
 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"
 #include "loba_simple.h"
@@ -38,7 +39,7 @@ namespace opt {
 
     // Simulation parameters
     int log_rate = 1;
-    bool exit_request = false;
+    volatile std::sig_atomic_t exit_request = 0;
 
     // Platform and deployment
     std::string platform_file;
@@ -80,10 +81,12 @@ namespace opt {
     {
         NOL_INSERT("besteffort", "balance with best effort strategy",
                    loba_besteffort);
-        NOL_INSERT("bulk", "describe your algorithm here...",
+        NOL_INSERT("bulk", "A multi-load-units assignation rule without ordering...",
                    loba_bulk);
         NOL_INSERT("fairstrategy", "balance with fair strategy",
                    loba_fairstrategy);
+        NOL_INSERT("lln", "Balance with less loaded neighbors without ordering-bulk method",
+                   loba_lln);
         NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",
                    loba_makhoul);
         NOL_INSERT("makhoul2", "balance with Makhoul's source code",
@@ -420,8 +423,9 @@ void opt::usage()
 
     std::clog << "Usage: " << opt::program_name
               << " [options] <platform_file> [<deployment_file>]\n";
+    std::clog << "Current values for the parameters are given between square brackets.\n";
 
-    std::clog << "\nGlobal options\n";
+    std::clog << "\nGlobal options:\n";
     std::clog << o("-h")
               << "print help and exit (use -hh or -hhh for extended help)\n";
     if (opt::help_requested < 1)
@@ -430,14 +434,14 @@ void opt::usage()
     std::clog << o("--help") << "print help from SimGrid framework and exit\n";
     std::clog << o("-V") << "print version and exit\n";
 
-    std::clog << "\nSimulation parameters\n";
+    std::clog << "\nSimulator output:\n";
     std::clog << o("-l value")
               << "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 << "\nAutomatic deployment:\n";
     std::clog << o("-T name")
               << "enable automatic deployment with selected topology"
               << " [" << opt::auto_depl::topology << "]\n";
@@ -454,21 +458,32 @@ void opt::usage()
               << " [" << opt_helper::on_off(opt::auto_depl::random_distribution)
               << "]\n";
     std::clog << o("-r value")
-              << "random seed, 0 for using it on time()"
+              << "random seed, 0 for a seed based on current date"
               << " [" << opt::auto_depl::random_seed << "]\n";
 
-    std::clog << "\nLoad balancing algorithm\n";
+    std::clog << "\nLoad balancing algorithm:\n";
     std::clog << o("-a name") << "load balancing algorithm"
               << " [" << opt::loba_algo << "]\n";
     if (opt::help_requested > 1)
         so_list(opt::loba_algorithms);
     std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")"
               << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
+
+    std::clog << "\nLb. and comp. iterations:\n";
     std::clog << o("-s value")
               << "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 << o("-d value")
+              << "start comp. iterations after given number of lb. iter."
+              << " [" << opt::comp_iter_delay << "]\n";
+    std::clog << o("-D value")
+              << "start comp. iterations after given time"
+              << " [" << opt::comp_time_delay << "]\n";
 
-    std::clog << "\nApplication parameters\n";
+    std::clog << "\nComputations and communications:\n";
     std::clog << o("-c [aN,...]a0")
               << "polynomial factors for computation cost"
               << " [" << opt::comp_cost.to_string() << "]\n";
@@ -481,17 +496,8 @@ void opt::usage()
     std::clog << o("-M value")
               << "maximum data transfer amount, 0 for no limit"
               << " [" << opt::max_transfer_amount << "]\n";
-    std::clog << o("-S value")
-              << "minimum duration between comp. iterations"
-              << " [" << opt::min_comp_iter_duration << "]\n";
-    std::clog << o("-d value")
-              << "start computations after given number of lb iterations"
-              << " [" << opt::comp_iter_delay << "]\n";
-    std::clog << o("-D value")
-              << "start computations after given time"
-              << " [" << opt::comp_time_delay << "]\n";
 
-    std::clog << "\nParameters for the end of the simulation\n";
+    std::clog << "\nEnd of the simulation:\n";
     std::clog << o("-i value")
               << "maximum number of lb. iterations, 0 for no limit"
               << " [" << opt::lb_maxiter << "]\n";
@@ -507,7 +513,7 @@ void opt::usage()
     if (opt::help_requested < 3)
         return;
 
-    std::clog << "\nLogging support\n"
+    std::clog << "\nLogging support:\n"
               << "    See SimGrid documentation on:\n"
               << "        http://simgrid.gforge.inria.fr/doc/group__XBT__log.html#log_user\n"
               << "    Existing categories are:\n"