X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/ba8a9c5fbc92dc95fc99d8078b3474fd2fd5a043..5c7c048885373897b33b2761df42444eb5b24640:/options.cpp?ds=sidebyside diff --git a/options.cpp b/options.cpp index 0a9fb5c..56049ed 100644 --- a/options.cpp +++ b/options.cpp @@ -1,16 +1,25 @@ -#include "options.h" - #include #include #include +#include #include // getopt #include -#include "loba_simple.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); +#include "loba_simple.h" +#include "loba_fairstrategy.h" + +#include "options.h" + namespace opt { + // Constants + + // A sum of loads if considered null if it is less than + // load_ratio_threshold percent of the sum of loads at init. + const double load_ratio_threshold = 1e-4; + // Global options std::string program_name; int help_requested = 0; @@ -26,64 +35,149 @@ namespace opt { // Automatic deployment namespace auto_depl { bool enabled = false; - std::string topology; + std::string topology("clique"); unsigned nhosts = 0; double load = 0.0; } // Load balancing algorithm - std::string loba_algo("none"); + std::string loba_algo("simple"); bool bookkeeping = false; // Application parameters cost_func comp_cost("1e9, 0"); // fixme: find better defaults cost_func comm_cost("1, 0"); // fixme: find better defaults - unsigned maxiter = 4; // fixme + unsigned comp_maxiter = 10; // fixme: find better defaults + unsigned lb_maxiter = comp_maxiter; // fixme: find better defaults bool exit_on_close = false; // Named parameters lists loba_algorithms_type loba_algorithms; loba_algorithms_type::loba_algorithms_type() { - THIS_INSERT("none", "no load-balancing", process); - THIS_INSERT("simple", "balance with least loaded neighbor", - loba_simple); + 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); } -#if 0 topologies_type topologies; topologies_type::topologies_type() { - THIS_INSERT("none", "no load-balancing", process); - THIS_INSERT("simple", "balance with least loaded neighbor", - loba_simple); + NOL_INSERT("btree", "binary tree topology, initial load at root", + deployment_btree); + NOL_INSERT("clique", "all connected topology", deployment_clique); + NOL_INSERT("hcube", "hypercube topology", deployment_hcube); + NOL_INSERT("line", "line topology, initial load at one end", + deployment_line); + NOL_INSERT("ring", "ring topology", deployment_ring); + NOL_INSERT("star", "star topology, initial load at center", + deployment_star); + NOL_INSERT("torus", "torus topology", deployment_torus); } -#endif } // namespace opt namespace { - const char* on_off(bool b) - { - return b ? "on" : "off"; + // local helper class + class opt_helper { + public: + static const char* on_off(bool b); + const char* descr(const char* str); + template + const char* val_or_string(const T& val, const char* str, + const T& deflt = 0); + template + static bool nol_find_prefix(const T& nol, const char* descr, + std::string& name); + + private: + std::string descr_str; + std::string val_or_string_str; + }; + +} // namespace + +const char* opt_helper::on_off(bool b) +{ + return b ? "on" : "off"; +} + +const char* opt_helper::descr(const char* str) +{ + const int descr_width = 35; + std::string& res = descr_str; + res = str; + res.resize(descr_width, '.'); + return res.c_str(); +} + +template +const char* opt_helper::val_or_string(const T& val, const char* str, + const T& deflt) +{ + std::string& res = val_or_string_str; + if (val != deflt) { + std::ostringstream oss; + oss << val; + res = oss.str(); + } else { + res = str; } + return res.c_str(); +} +template +bool opt_helper::nol_find_prefix(const T& nol, const char* descr, + std::string& name) +{ + bool result = nol.exists(name); + if (!result) { + std::stack candidates; + for (typename T::iterator it = nol.begin() ; it != nol.end() ; ++it) { + const std::string& fullname = nol.get_name(it); + if (fullname.compare(0, name.length(), name) == 0) + candidates.push(fullname); + } + switch (candidates.size()) { + case 0: + ERROR2("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()); + break; + default: + ERROR2("ambiguous %s -- %s", descr, name.c_str()); + while (!candidates.empty()) { + ERROR1(" candidates are -- %s", candidates.top().c_str()); + candidates.pop(); + } + break; + } + } + return result; } -int opt::parse_args(int* argc, char* argv[]) +bool opt::parse_args(int* argc, char* argv[]) { - int result = 1; + bool result = true; opt::program_name = argv[0]; opt::program_name.erase(0, 1 + opt::program_name.find_last_of('/')); int c; opterr = 0; - while ((c = getopt(*argc, argv, "a:bc:C:ehi:l:L:N:T:V")) != -1) { + while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:T:vV")) != -1) { switch (c) { case 'a': opt::loba_algo = optarg; + result = opt_helper::nol_find_prefix(opt::loba_algorithms, + "load balancing algorithm", + opt::loba_algo) + && result; break; case 'b': opt::bookkeeping = true; @@ -101,7 +195,12 @@ int opt::parse_args(int* argc, char* argv[]) opt::comm_cost = cost_func(optarg); break; case 'i': - std::istringstream(optarg) >> opt::maxiter; + std::istringstream(optarg) >> opt::comp_maxiter; + break; + case 'I': + std::istringstream(optarg) >> opt::lb_maxiter; + ERROR0("option -I not implemented yet"); + result = false; break; case 'l': std::istringstream(optarg) >> opt::log_rate; @@ -114,17 +213,23 @@ int opt::parse_args(int* argc, char* argv[]) break; case 'T': opt::auto_depl::topology = optarg; + result = opt_helper::nol_find_prefix(opt::topologies, "topology", + opt::auto_depl::topology) + && result; + break; + case 'v': + // nothing to do: this option is checked at the very + // beginning of main() break; case 'V': opt::version_requested = true; break; case '?': ERROR1("invalid option -- '%c'", optopt); - result = 0; + result = false; break; } } - opt::auto_depl::enabled = !opt::auto_depl::topology.empty(); if (opt::version_requested || opt::help_requested) return 1; @@ -133,20 +238,16 @@ int opt::parse_args(int* argc, char* argv[]) opt::platform_file = argv[optind++]; } else { ERROR0("missing parameter -- "); - result = 0; + result = false; } - if (!opt::auto_depl::enabled) { - if (optind < *argc) { - opt::deployment_file = argv[optind++]; - } else { - ERROR0("missing parameter -- "); - result = 0; - } + if (optind < *argc) { + opt::deployment_file = argv[optind++]; } + opt::auto_depl::enabled = opt::deployment_file.empty(); while (optind < *argc) { ERROR1("unused parameter -- \"%s\"", argv[optind++]); - result = 0; + result = false; } return result; @@ -154,23 +255,36 @@ int opt::parse_args(int* argc, char* argv[]) void opt::print() { + opt_helper h; + +#define DESCR(description, format, value) \ + INFO2("| %s: " format, h.descr(description), value) + INFO0(",----[ Simulation parameters ]"); - INFO1("| platform file.......: \"%s\"", opt::platform_file.c_str()); - if (opt::auto_depl::enabled) { - INFO0("| automatic deployment enabled with:"); - INFO1("| topology........: %s", opt::auto_depl::topology.c_str()); - INFO1("| number of hosts.: %u", opt::auto_depl::nhosts); - INFO1("| initial load....: %g", opt::auto_depl::load); + 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"); + 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")); } else { - INFO1("| deployment file.....: \"%s\"", opt::deployment_file.c_str()); + DESCR("deployment file", "\"%s\"", deployment_file.c_str()); } - INFO1("| log rate............: %u", opt::log_rate); - INFO1("| maxiter.............: %u", opt::maxiter); - INFO1("| exit on close.......: %s", on_off(opt::exit_on_close)); - INFO1("| bookkeeping.........: %s", on_off(opt::bookkeeping)); - INFO1("| comp. cost factors..: [%s]", opt::comp_cost.to_string().c_str()); - INFO1("| comm. cost factors..: [%s]", opt::comm_cost.to_string().c_str()); + DESCR("load balancing algorithm", "%s", loba_algo.c_str()); + DESCR("bookkeeping", "%s", h.on_off(bookkeeping)); + DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str()); + DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str()); + DESCR("maximum number of comp. iterations", "%s", + h.val_or_string(comp_maxiter, "infinity")); + DESCR("maximum number of lb. iterations", "%s", + h.val_or_string(lb_maxiter, "infinity")); + DESCR("exit on close", "%s", h.on_off(exit_on_close)); INFO0("`----"); + +#undef DESCR } void opt::usage() @@ -190,13 +304,11 @@ void opt::usage() std::clog << "Usage: " << opt::program_name - << " [options] \n"; - std::clog << " " << opt::program_name - << " [options] -T type \n"; + << " [options] []\n"; std::clog << "\nGlobal options\n"; std::clog << o("-h") - << "print help and exit (use -hh for extended help)\n"; + << "print help and exit (use -hh or -hhh for extended help)\n"; if (opt::help_requested < 1) return; @@ -207,16 +319,15 @@ void opt::usage() std::clog << o("-l value") << "print current load every n-th 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 << o("-T name") - << "enable automatic deployment with selected topology\n"; + << "enable automatic deployment with selected topology" + << " (" << opt::auto_depl::topology << ")\n"; if (opt::help_requested > 1) -#if 0 so_list(opt::topologies); -#else - std::clog << so("name") << "FIXME\n"; // fixme -#endif std::clog << o("-L value") << "total load with auto deployment, 0 for number of hosts" << " (" << opt::auto_depl::load << ")\n"; @@ -240,8 +351,25 @@ void opt::usage() << " (" << opt::comm_cost.to_string() << ")\n"; std::clog << o("-e") << "exit on reception of \"close\" message\n"; std::clog << o("-i value") - << "maximum number of iterations, 0 for infinity" - << " (" << opt::maxiter << ")\n"; + << "maximum number of comp. iterations, 0 for infinity" + << " (" << opt::comp_maxiter << ")\n"; + std::clog << o("-I value") + << "maximum number of lb. iterations, 0 for infinity" + << " (" << opt::lb_maxiter << ")\n"; + + if (opt::help_requested < 3) + return; + + 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" + << " simu : root of following categories\n" + << " main : messages from global infrastructure\n" + << " 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"; #undef so_list #undef so