X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/73e978b894f32ff9a844135031fdf748c635ebac..21819915856816637b4cb91ff4000d139a914b2e:/options.cpp diff --git a/options.cpp b/options.cpp index 908a797..c5f5c29 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; @@ -229,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:eEhi: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; @@ -328,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; @@ -392,8 +398,8 @@ 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()); } @@ -477,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" @@ -540,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"