X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/6c5ce85989b0976bbd0a663344cc270433ec1b28..36f2b9a493e14c00fec410c84dfaff6a654ce929:/options.cpp?ds=inline diff --git a/options.cpp b/options.cpp index e4d1236..a8178a9 100644 --- a/options.cpp +++ b/options.cpp @@ -1,14 +1,16 @@ -#include "options.h" - #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 { // Global options @@ -45,6 +47,7 @@ namespace opt { 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)", process); NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple); } @@ -75,7 +78,7 @@ int opt::parse_args(int* argc, char* argv[]) 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:l:L:N:T:vV")) != -1) { switch (c) { case 'a': opt::loba_algo = optarg; @@ -120,6 +123,10 @@ int opt::parse_args(int* argc, char* argv[]) result = 0; } break; + case 'v': + // nothing to do: this option is checked at the very + // beginning of main() + break; case 'V': opt::version_requested = true; break; @@ -235,6 +242,8 @@ 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")