X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/15ace044d0d9e82ef744e22cf84168771e669678..b0b2d9cb57d83fcdfb92837561ffb5dbab288323:/options.cpp?ds=sidebyside diff --git a/options.cpp b/options.cpp index 96542f6..b387267 100644 --- a/options.cpp +++ b/options.cpp @@ -10,8 +10,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); #include "deployment.h" #include "process.h" +#include "loba_2besteffort.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 +36,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; @@ -47,7 +51,7 @@ namespace opt { bool enabled = false; std::string topology("clique"); unsigned nhosts = 0; - double load = 0.0; + double load = -1.0; bool random_distribution = false; unsigned long random_seed = 0; } @@ -55,9 +59,11 @@ namespace opt { // Load balancing algorithm std::string loba_algo("simple"); bool bookkeeping = false; + bool egocentric = false; double min_lb_iter_duration = 1.0; // fixme: find better defaults double min_transfer_amount = 0.0; double max_transfer_amount = 0.0; + bool integer_transfer = false; // Application parameters cost_func comp_cost("1e9, 0"); // fixme: find better defaults @@ -76,10 +82,16 @@ namespace opt { loba_algorithms_type loba_algorithms; loba_algorithms_type::loba_algorithms_type() { + NOL_INSERT("2besteffort", "balance with best effort strategy (take #2)", + loba_2besteffort); 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", @@ -210,11 +222,11 @@ bool opt::parse_args(int* argc, char* argv[]) 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:d:D:ehi:I:l:L:m:M:N:r:Rs:S:t:T:vV")) != -1) { + "a:bc:C:d:D:eEhi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:Z")) != -1) { switch (c) { case 'a': opt::loba_algo = optarg; @@ -226,12 +238,6 @@ bool opt::parse_args(int* argc, char* argv[]) case 'b': opt::bookkeeping = !opt::bookkeeping; break; - case 'e': - opt::exit_on_close = !opt::exit_on_close; - break; - case 'h': - opt::help_requested++; - break; case 'c': try { opt::comp_cost = cost_func(optarg); @@ -256,6 +262,15 @@ bool opt::parse_args(int* argc, char* argv[]) case 'D': PARSE_ARG(opt::comp_time_delay); break; + case 'e': + opt::exit_on_close = !opt::exit_on_close; + break; + case 'E': + opt::egocentric = !opt::egocentric; + break; + case 'h': + opt::help_requested++; + break; case 'i': PARSE_ARG(opt::lb_maxiter); break; @@ -306,6 +321,13 @@ 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 'Z': + opt::integer_transfer = !opt::integer_transfer; + break; case '?': XBT_ERROR("invalid option -- '%c'", optopt); result = false; @@ -361,8 +383,10 @@ void opt::print() 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")); + if (auto_depl::load < 0.0) + DESCR("- initial load (average)", "%g", -auto_depl::load); + else + DESCR("- initial load (total)", "%g", auto_depl::load); DESCR("- random initial load distribution", "%s", h.on_off(auto_depl::random_distribution)); DESCR("- random seed", "%s", @@ -372,6 +396,7 @@ void opt::print() } DESCR("load balancing algorithm", "%s", loba_algo.c_str()); DESCR("bookkeeping", "%s", h.on_off(bookkeeping)); + DESCR("egocentric mode", "%s", h.on_off(egocentric)); DESCR("minimum duration between lb. iterations", "%g", min_lb_iter_duration); DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str()); @@ -379,6 +404,8 @@ void opt::print() DESCR("minimum data transfer amount", "%g", min_transfer_amount); DESCR("maximum data transfer amount", "%s", h.val_or_string(max_transfer_amount, "no limit")); + DESCR("only transfer integer data shares", "%s", + h.on_off(integer_transfer)); DESCR("minimum duration between comp. iterations", "%g", min_comp_iter_duration); DESCR("computations start after lb. iter", "%u", comp_iter_delay); @@ -412,8 +439,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,21 +450,21 @@ 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"; if (opt::help_requested > 1) so_list(opt::topologies); std::clog << o("-L value") - << "total load with auto deployment, 0 for number of hosts" + << "total load with auto deployment, average if negative" << " [" << opt::auto_depl::load << "]\n"; std::clog << o("-N value") << "number of hosts to use with auto deployment, 0 for max." @@ -446,21 +474,37 @@ 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 << o("-E") << "toggle egocentric mode when bookkeeping" + << " [" << opt_helper::on_off(opt::egocentric) << "]\n"; + if (opt::help_requested > 1) + std::clog << o("") + << "(a not so good idea introduced by git commit f5336c5)\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 +517,11 @@ 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 << o("-Z") + << "toggle transfer of integer data shares only" + << " [" << opt_helper::on_off(opt::integer_transfer) << "]\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 +537,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"