X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/51f707d60785283c582c16c141ab6832a744dd3a..5ee35ecefd297b90d4f2cb1f1158fdf1e2366360:/options.cpp diff --git a/options.cpp b/options.cpp index 89f8b18..3602fbf 100644 --- a/options.cpp +++ b/options.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -9,11 +10,17 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); #include "deployment.h" #include "process.h" -#include "loba_simple.h" +#include "loba_besteffort.h" #include "loba_fairstrategy.h" +#include "loba_makhoul.h" +#include "loba_makhoul2.h" +#include "loba_simple.h" +#include "misc.h" #include "options.h" +#define DATA_DESCR_WIDTH 42 + namespace opt { // Constants @@ -26,9 +33,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 - unsigned log_rate = 1; + int log_rate = 1; + bool exit_request = false; // Platform and deployment std::string platform_file; @@ -40,32 +49,46 @@ namespace opt { std::string topology("clique"); unsigned nhosts = 0; double load = 0.0; + bool random_distribution = false; + unsigned long random_seed = 0; } // Load balancing algorithm std::string loba_algo("simple"); bool bookkeeping = false; + double min_lb_iter_duration = 1.0; // fixme: find better defaults + double min_transfer_amount = 0.0; + double max_transfer_amount = 0.0; // 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 comp_cost("1e9, 0"); // fixme: find better defaults + cost_func comm_cost("1e6, 0"); // fixme: find better defaults + double min_comp_iter_duration = 1.0; // fixme: find better defaults + unsigned comp_iter_delay = 0; // fixme: find better defaults + double comp_time_delay = 0.0; // fixme: find better defaults // Parameters for the end of the simulation - // fixme: find better defaults - unsigned lb_maxiter = 10; + unsigned lb_maxiter = 0; unsigned comp_maxiter = 0; double time_limit = 0; - bool exit_on_close = false; + bool exit_on_close = true; // Named parameters lists loba_algorithms_type loba_algorithms; loba_algorithms_type::loba_algorithms_type() { - NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy); - NOL_INSERT("none", "no load-balancing (for testing only)", process); - NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple); + NOL_INSERT("besteffort", "balance with best effort strategy", + loba_besteffort); + NOL_INSERT("fairstrategy", "balance with fair strategy", + loba_fairstrategy); + NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm", + loba_makhoul); + NOL_INSERT("makhoul2", "balance with Makhoul's source code", + loba_makhoul2); + NOL_INSERT("none", "no load-balancing (for testing only)", + process); + NOL_INSERT("simple", "balance with least loaded neighbor", + loba_simple); } topologies_type topologies; @@ -90,6 +113,8 @@ namespace { // local helper class class opt_helper { public: + template + 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 @@ -106,6 +131,16 @@ namespace { } // namespace +template +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"; @@ -113,10 +148,9 @@ const char* opt_helper::on_off(bool b) const char* opt_helper::descr(const char* str) { - const int descr_width = 40; std::string& res = descr_str; res = str; - res.resize(descr_width, '.'); + res.resize(DATA_DESCR_WIDTH, '.'); return res.c_str(); } @@ -149,18 +183,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; @@ -175,10 +209,13 @@ 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:d:D:ehi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:")) != -1) { switch (c) { case 'a': opt::loba_algo = optarg; @@ -197,31 +234,65 @@ 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 'd': + PARSE_ARG(opt::comp_iter_delay); + break; + case 'D': + PARSE_ARG(opt::comp_time_delay); 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 'm': + PARSE_ARG(opt::min_transfer_amount); + break; + case 'M': + PARSE_ARG(opt::max_transfer_amount); break; case 'N': - std::istringstream(optarg) >> opt::auto_depl::nhosts; + PARSE_ARG(opt::auto_depl::nhosts); + break; + case 'r': + PARSE_ARG(opt::auto_depl::random_seed); + break; + case 'R': + opt::auto_depl::random_distribution = + !opt::auto_depl::random_distribution; 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,20 +307,26 @@ 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 '?': - 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 -- "); + XBT_ERROR("missing parameter -- "); result = false; } if (optind < *argc) { @@ -258,10 +335,19 @@ 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; } + if (opt::max_transfer_amount && + opt::max_transfer_amount < opt::min_transfer_amount) { + XBT_ERROR("max. data transfer amount < min. data transfer amount"); + result = false; + } + + if (!opt::auto_depl::random_seed) + opt::auto_depl::random_seed = time(NULL); + return result; } @@ -270,33 +356,45 @@ 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")); DESCR("- initial load", "%s", h.val_or_string(auto_depl::load, "auto")); + DESCR("- random initial load distribution", "%s", + h.on_off(auto_depl::random_distribution)); + DESCR("- random seed", "%s", + h.val_or_string(auto_depl::random_seed, "time based")); } 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("minimum duration between lb. iterations", "%g", + min_lb_iter_duration); 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 data transfer amount", "%g", min_transfer_amount); + DESCR("maximum data transfer amount", "%s", + h.val_or_string(max_transfer_amount, "no limit")); + DESCR("minimum duration between comp. iterations", "%g", + min_comp_iter_duration); + DESCR("computations start after lb. iter", "%u", comp_iter_delay); + DESCR("computations start after time", "%g", comp_time_delay); DESCR("maximum number of lb. iterations", "%s", - h.val_or_string(lb_maxiter, "infinity")); + h.val_or_string(lb_maxiter, "no limit")); 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")); + h.val_or_string(comp_maxiter, "no limit")); + DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit")); DESCR("exit on close", "%s", h.on_off(exit_on_close)); - INFO0("`----"); + XBT_INFO("`----"); #undef DESCR } @@ -319,8 +417,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) @@ -329,14 +428,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"; @@ -348,8 +447,15 @@ void opt::usage() std::clog << o("-N value") << "number of hosts to use with auto deployment, 0 for max." << " [" << opt::auto_depl::nhosts << "]\n"; - - std::clog << "\nLoad balancing algorithm\n"; + std::clog << o("-R") + << "toggle random initial load distribution" + << " [" << opt_helper::on_off(opt::auto_depl::random_distribution) + << "]\n"; + std::clog << o("-r value") + << "random seed, 0 for a seed based on current date" + << " [" << opt::auto_depl::random_seed << "]\n"; + + std::clog << "\nLoad balancing algorithm:\n"; std::clog << o("-a name") << "load balancing algorithm" << " [" << opt::loba_algo << "]\n"; if (opt::help_requested > 1) @@ -357,26 +463,43 @@ void opt::usage() std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")" << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n"; - std::clog << "\nApplication parameters\n"; - std::clog << o("-c [fn,...]f0") + 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 << "\nComputations and communications:\n"; + 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"; - - std::clog << "\nParameters for the end of the simulation\n"; + std::clog << o("-m value") + << "minimum data transfer amount" + << " [" << opt::min_transfer_amount << "]\n"; + std::clog << o("-M value") + << "maximum data transfer amount, 0 for no limit" + << " [" << opt::max_transfer_amount << "]\n"; + + std::clog << "\nEnd of the simulation:\n"; std::clog << o("-i value") - << "maximum number of lb. iterations, 0 for infinity" + << "maximum number of lb. iterations, 0 for no limit" << " [" << opt::lb_maxiter << "]\n"; std::clog << o("-I value") - << "maximum number of comp. iterations, 0 for infinity" + << "maximum number of comp. iterations, 0 for no limit" << " [" << opt::comp_maxiter << "]\n"; std::clog << o("-t value") - << "time limit (simulated time), 0 for infinity" + << "time limit (simulated time), 0 for no limit" << " [" << opt::time_limit << "]\n"; std::clog << o("-e") << "toggle exit on reception of \"close\" message" << " [" << opt_helper::on_off(opt::exit_on_close) << "]\n"; @@ -384,7 +507,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" @@ -393,7 +516,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";