X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/325b135f0ee33c6c0242a14e2f58a54fb571b032..d43e446400ac7b65d7d2dd3acd57f8f669484449:/options.cpp?ds=sidebyside diff --git a/options.cpp b/options.cpp index 4f9c52c..6880969 100644 --- a/options.cpp +++ b/options.cpp @@ -1,6 +1,5 @@ #include "options.h" -#include // strrchr #include #include #include @@ -12,17 +11,24 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main); namespace opt { - const char* program_name; + std::string program_name; - const char* platform_file; - const char* application_file; + std::string platform_file; + std::string deployment_file; int help_requested = 0; bool version_requested = false; unsigned log_rate = 1; - unsigned maxiter = 4; + namespace auto_depl { + bool enabled = false; + std::string topology; + unsigned nhosts = 0; + double load = 0.0; + } + + unsigned maxiter = 4; // fixme bool exit_on_close = false; bool bookkeeping = false; @@ -45,12 +51,12 @@ int opt::parse_args(int* argc, char* argv[]) { int result = 1; - char* tmp = strrchr(argv[0], '/'); - opt::program_name = (tmp ? tmp + 1 : argv[0]); - + 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, "bc:C:ehi:l:V")) != -1) { + while ((c = getopt(*argc, argv, "bc:C:ehi:l:L:N:T:V")) != -1) { switch (c) { case 'b': opt::bookkeeping = true; @@ -73,6 +79,15 @@ int opt::parse_args(int* argc, char* argv[]) case 'l': std::istringstream(optarg) >> opt::log_rate; break; + case 'L': + std::istringstream(optarg) >> opt::auto_depl::load; + break; + case 'N': + std::istringstream(optarg) >> opt::auto_depl::nhosts; + break; + case 'T': + opt::auto_depl::topology = optarg; + break; case 'V': opt::version_requested = true; break; @@ -82,27 +97,29 @@ int opt::parse_args(int* argc, char* argv[]) break; } } + opt::auto_depl::enabled = !opt::auto_depl::topology.empty(); + if (opt::version_requested || opt::help_requested) return 1; - int rem_args = *argc - optind; - switch (rem_args) { - case 0: + if (optind < *argc) { + opt::platform_file = argv[optind++]; + } else { ERROR0("missing parameter -- "); - case 1: - ERROR0("missing parameter -- "); result = 0; - break; + } + if (!opt::auto_depl::enabled) { + if (optind < *argc) { + opt::deployment_file = argv[optind++]; + } else { + ERROR0("missing parameter -- "); + result = 0; + } + } - default: - opt::platform_file = argv[optind]; - opt::application_file = argv[optind + 1]; - if (rem_args == 2) - break; - for (int i = optind + 2 ; i < *argc ; ++i) - ERROR1("unused parameter -- \"%s\"", argv[i]); + while (optind < *argc) { + ERROR1("unused parameter -- \"%s\"", argv[optind++]); result = 0; - break; } return result; @@ -111,8 +128,15 @@ int opt::parse_args(int* argc, char* argv[]) void opt::print() { INFO0(",----[ Simulation parameters ]"); - INFO1("| platform_file.......: \"%s\"", opt::platform_file); - INFO1("| application_file....: \"%s\"", opt::application_file); + 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); + } else { + INFO1("| deployment file.....: \"%s\"", opt::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)); @@ -124,37 +148,47 @@ void opt::print() void opt::usage() { - const int indent1 = 6; - const int indent2 = 12; - -#define oo(opt, arg) std::setw(indent1) << (opt) << " " \ - << std::setw(indent2) << std::left << (arg) << std::right -#define o(opt) oo(opt, "") +#define o(opt) " " << std::setw(14) \ + << std::left << (opt) << std::right << " " +#define so(subopt) std::setw(10) << (subopt) << ": " std::clog << "Usage: " << opt::program_name - << " [options] \n"; + << " [options] \n"; std::clog << o("-h") - << "print help and exit (use -hh or -hhh for extended help)\n"; + << "print help and exit (use -hh for extended help)\n"; if (opt::help_requested < 1) return; + std::clog << o("--help") << "print help from SimGrid framework and exit\n"; std::clog << o("-V") << "print version and exit\n"; std::clog << o("-b") << "activate bookkeeping\n"; - std::clog << oo("-c", "[fn,...]f0") - << "polynomial factors for computation cost (" - << opt::comp_cost.to_string() << ")\n"; - std::clog << oo("-C", "[fn,...]f0") - << "polynomial factors for communication cost (" - << opt::comm_cost.to_string() << ")\n"; - std::clog << o("-e") << "exit on close reception\n"; - std::clog << oo("-i", "value") - << "maximum number of iterations, 0 for infinity (" - << opt::maxiter << ")\n"; - std::clog << oo("-l", "value") - << "print current load every \"value\" iterations, 0 to disable (" - << opt::log_rate << ")\n"; + std::clog << o("-c [fn,...]f0") + << "polynomial factors for computation cost" + << " (" << opt::comp_cost.to_string() << ")\n"; + std::clog << o("-C [fn,...]f0") + << "polynomial factors for communication cost" + << " (" << 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"; + std::clog << o("-l value") + << "print current load every n-th iterations, 0 to disable" + << " (" << opt::log_rate << ")\n"; + std::clog << o("-L value") + << "total load with auto deployment, 0 for number of hosts" + << " (" << opt::auto_depl::load << ")\n"; + std::clog << o("-N value") + << "number of hosts to use with auto deployment," + << " 0 for max. (" << opt::auto_depl::nhosts << ")\n"; + std::clog << o("-T type") + << "enable automatic deployment with selected topology\n"; + if (opt::help_requested > 1) { + std::clog << so(1) << "pipo\n"; + std::clog << so(42) << "atchoum\n"; + } #undef o #undef oo