unsigned lb_maxiter = 0;
unsigned comp_maxiter = 0;
double time_limit = 0;
- bool exit_on_convergence = false;
+ unsigned exit_on_convergence = 0;
bool exit_on_close = true;
// Named parameters lists
const char* opt_helper::descr(const char* str)
{
- std::string& res = descr_str;
- res = str;
- res.resize(DATA_DESCR_WIDTH, '.');
- return res.c_str();
+ descr_str = str;
+ descr_str.push_back(' ');
+ descr_str.resize(DATA_DESCR_WIDTH, '.');
+ return descr_str.c_str();
}
template <typename T>
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();
+ val_or_string_str = oss.str();
} else {
- res = str;
+ val_or_string_str = str;
}
- return res.c_str();
+ return val_or_string_str.c_str();
}
template <typename T>
opterr = 0;
while ((c = getopt(*argc, argv,
"%:"
- "a:bc:C:d:D:eEGhi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
+ "a:bc:C:d:D:eEg:hi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
!= -1) {
switch (c) {
case '%':
case 'E':
opt::egocentric = !opt::egocentric;
break;
- case 'G':
- opt::exit_on_convergence = !opt::exit_on_convergence;
+ case 'g':
+ PARSE_ARG(opt::exit_on_convergence);
break;
case 'h':
opt::help_requested++;
h.val_or_string(comp_maxiter, "no limit"));
DESCR("convergence is assumed within (\%)", "%g", opt::avg_load_ratio);
DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));
- DESCR("exit on convergence", "%s", h.on_off(exit_on_convergence));
+ DESCR("exit on convergence", "%s",
+ h.val_or_string(exit_on_convergence, "disabled"));
DESCR("exit on close", "%s", h.on_off(exit_on_close));
XBT_INFO("`----");
std::clog << o("-% value")
<< "percent of the load average to assume the convergence"
<< " [" << opt::avg_load_ratio << "]\n";
- std::clog << o("-G") << "toggle exit on detection of convergence"
- << " [" << opt_helper::on_off(opt::exit_on_convergence) << "]\n";
+ if (opt::help_requested > 1)
+ std::clog << o("")
+ << "- if negative: use 100 * (nhosts / -value) / avg_load\n";
+ std::clog << o("-g value")
+ << "number of consecutive detections of convergence to exit"
+ << " [" << opt::exit_on_convergence << "]\n";
+ if (opt::help_requested > 1)
+ std::clog << o("")
+ << "- use 0 to disable\n";
std::clog << o("-t value")
<< "time limit (simulated time), 0 for no limit"
<< " [" << opt::time_limit << "]\n";