X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/5e43cdf74cfa40b69f5e7e9eb3957c43f4accb86..48de9544b7eac2f9d40ea34a42c1d1a3d7ccbbfe:/options.cpp?ds=inline diff --git a/options.cpp b/options.cpp index 3ec77d4..3eed8a2 100644 --- a/options.cpp +++ b/options.cpp @@ -11,7 +11,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); #include "deployment.h" #include "process.h" #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" @@ -33,10 +35,11 @@ namespace opt { std::string program_name; int help_requested = 0; bool version_requested = false; + int option_x = 0; // hidden option, for debugging purpose // 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; @@ -78,8 +81,12 @@ namespace opt { { NOL_INSERT("besteffort", "balance with best effort strategy", loba_besteffort); + 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", @@ -214,7 +221,7 @@ bool opt::parse_args(int* argc, char* argv[]) int c; opterr = 0; while ((c = getopt(*argc, argv, - "a:bc:C:d:D:ehi:I:l:L:m:M:N:r:Rs:S:t:T:vV")) != -1) { + "a:bc:C:d:D:ehi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:")) != -1) { switch (c) { case 'a': opt::loba_algo = optarg; @@ -306,6 +313,10 @@ bool opt::parse_args(int* argc, char* argv[]) case 'V': opt::version_requested = true; break; + case 'x': + PARSE_ARG(opt::option_x); + XBT_WARN("option_x set to %d", opt::option_x); + break; case '?': XBT_ERROR("invalid option -- '%c'", optopt); result = false; @@ -412,8 +423,9 @@ void opt::usage() std::clog << "Usage: " << opt::program_name << " [options] []\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) @@ -422,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"; @@ -446,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"; @@ -473,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"; @@ -499,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"