X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/07a0aaa69d81731f3b74c63bdbb311587d9cf4f9..21819915856816637b4cb91ff4000d139a914b2e:/options.cpp diff --git a/options.cpp b/options.cpp index cac9752..c5f5c29 100644 --- a/options.cpp +++ b/options.cpp @@ -17,6 +17,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); #include "loba_lln.h" #include "loba_makhoul.h" #include "loba_makhoul2.h" +#include "loba_makhoul3.h" #include "loba_simple.h" #include "misc.h" @@ -36,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; @@ -59,6 +61,7 @@ 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; @@ -85,16 +88,18 @@ namespace opt { loba_2besteffort); NOL_INSERT("besteffort", "balance with best effort strategy", loba_besteffort); - NOL_INSERT("bulk", "A multi-load-units assignation rule without ordering...", + 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", + 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", loba_makhoul2); + NOL_INSERT("makhoul3", "variation on Makhoul's algorithm", + loba_makhoul3); NOL_INSERT("none", "no load-balancing (for testing only)", process); NOL_INSERT("simple", "balance with least loaded neighbor", @@ -225,7 +230,8 @@ 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:vVx:Z")) != -1) { + "a:bc:C:d:D:eEhi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z")) + != -1) { switch (c) { case 'a': opt::loba_algo = optarg; @@ -237,12 +243,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); @@ -267,6 +267,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; @@ -321,6 +330,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; @@ -385,13 +398,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()); @@ -469,8 +483,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" @@ -479,6 +496,11 @@ void opt::usage() 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") @@ -527,6 +549,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"