X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/73e978b894f32ff9a844135031fdf748c635ebac..b2361f06c9f703a65c2a5bcd80f026311217e936:/options.cpp?ds=sidebyside diff --git a/options.cpp b/options.cpp index 908a797..8027463 100644 --- a/options.cpp +++ b/options.cpp @@ -37,7 +37,8 @@ namespace opt { std::string program_name; int help_requested = 0; bool version_requested = false; - int option_x = 0; // hidden option, for debugging purpose + int option_x = 0; // hidden option (int) + double option_X = 0.0; // hidden option (double) // Simulation parameters int log_rate = 1; @@ -65,6 +66,7 @@ namespace opt { double min_transfer_amount = 0.0; double max_transfer_amount = 0.0; bool integer_transfer = false; + unsigned loba_best_divisor = 1; // Application parameters cost_func comp_cost("1e9, 0"); // fixme: find better defaults @@ -229,7 +231,8 @@ bool opt::parse_args(int* argc, char* argv[]) int c; opterr = 0; while ((c = getopt(*argc, argv, - "a:bc:C:d:D:eEhi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:Z")) != -1) { + "a:bc:C:d:D:eEhi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z")) + != -1) { switch (c) { case 'a': opt::loba_algo = optarg; @@ -277,6 +280,9 @@ bool opt::parse_args(int* argc, char* argv[]) case 'i': PARSE_ARG(opt::lb_maxiter); break; + case 'k': + PARSE_ARG(opt::loba_best_divisor); + break; case 'I': PARSE_ARG(opt::comp_maxiter); break; @@ -328,6 +334,10 @@ bool opt::parse_args(int* argc, char* argv[]) PARSE_ARG(opt::option_x); XBT_WARN("option_x set to %d", opt::option_x); break; + case 'X': + PARSE_ARG(opt::option_X); + XBT_WARN("option_X set to %g", opt::option_X); + break; case 'Z': opt::integer_transfer = !opt::integer_transfer; break; @@ -340,6 +350,13 @@ bool opt::parse_args(int* argc, char* argv[]) #undef PARSE_ARG + if (opt::option_x) { // FIXME: remove this one day... + opt::loba_best_divisor = opt::option_x; + XBT_WARN("divisor for algorithms *best* set from option -x (%d => %u)," + " use -k instead", + opt::option_x, opt::loba_best_divisor); + } + if (opt::version_requested || opt::help_requested) return 1; @@ -361,7 +378,15 @@ bool opt::parse_args(int* argc, char* argv[]) if (opt::max_transfer_amount && opt::max_transfer_amount < opt::min_transfer_amount) { - XBT_ERROR("max. data transfer amount < min. data transfer amount"); + XBT_ERROR("max. data transfer amount (%g) <" + " min. data transfer amount (%g)", + opt::max_transfer_amount, opt::min_transfer_amount); + result = false; + } + + if (opt::loba_best_divisor <= 0) { + XBT_ERROR("divisor for algorithms *best* (%u) should be positive", + opt::loba_best_divisor); result = false; } @@ -392,16 +417,14 @@ void opt::print() 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", - h.val_or_string(auto_depl::random_seed, "time based")); + DESCR("- random seed", "%s", // NOTE: cannot be 0 here anymore + h.val_or_string(auto_depl::random_seed, "constant random", 1UL)); } 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("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()); DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str()); DESCR("minimum data transfer amount", "%g", min_transfer_amount); @@ -409,6 +432,9 @@ void opt::print() h.val_or_string(max_transfer_amount, "no limit")); DESCR("only transfer integer data shares", "%s", h.on_off(integer_transfer)); + DESCR("divisor for algorithms *best*", "%u", loba_best_divisor); + DESCR("minimum duration between lb. iterations", "%g", + min_lb_iter_duration); DESCR("minimum duration between comp. iterations", "%g", min_comp_iter_duration); DESCR("computations start after lb. iter", "%u", comp_iter_delay); @@ -477,8 +503,11 @@ void opt::usage() << " [" << 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" + << "random seed for initial load distribution, or 0, or 1" << " [" << opt::auto_depl::random_seed << "]\n"; + if (opt::help_requested > 1) + std::clog << o("") << "- use 0 for a seed based on current date\n" + << o("") << "- use 1 for a constant random\n"; std::clog << "\nLoad balancing algorithm:\n"; std::clog << o("-a name") << "load balancing algorithm" @@ -492,6 +521,8 @@ void opt::usage() if (opt::help_requested > 1) std::clog << o("") << "(a not so good idea introduced by git commit f5336c5)\n"; + std::clog << o("-k value") << "divisor for algorithms *best*" + << " [" << opt::loba_best_divisor << "]\n"; std::clog << "\nLb. and comp. iterations:\n"; std::clog << o("-s value") @@ -540,6 +571,12 @@ void opt::usage() if (opt::help_requested < 3) return; + std::clog << "\nHidden options:\n"; + std::clog << o("-x value") << "value is an integer" + << " [" << opt::option_x << "]\n"; + std::clog << o("-X value") << "value is a real number" + << " [" << opt::option_X << "]\n"; + std::clog << "\nLogging support:\n" << " See SimGrid documentation on:\n" << " http://simgrid.gforge.inria.fr/doc/group__XBT__log.html#log_user\n"