A
lgorithmique
N
umérique
D
istribuée
Private GIT Repository
projects
/
loba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug fixed: use a timeout on receive.
[loba.git]
/
options.cpp
diff --git
a/options.cpp
b/options.cpp
index 1a3db2c2995d0e0c268d4b1fd70c6efca02e24c2..d1d136bcb31d957cad816a51d44e877bb532a5e4 100644
(file)
--- a/
options.cpp
+++ b/
options.cpp
@@
-54,8
+54,9
@@
namespace opt {
// Parameters for the end of the simulation
// fixme: find better defaults
// Parameters for the end of the simulation
// fixme: find better defaults
- unsigned comp_maxiter = 10;
- unsigned lb_maxiter = comp_maxiter;
+ unsigned lb_maxiter = 10;
+ unsigned comp_maxiter = 0;
+ double time_limit = 0;
bool exit_on_close = false;
// Named parameters lists
bool exit_on_close = false;
// Named parameters lists
@@
-177,7
+178,7
@@
bool opt::parse_args(int* argc, char* argv[])
int c;
opterr = 0;
int c;
opterr = 0;
- while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:T:vV")) != -1) {
+ while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:
t:
T:vV")) != -1) {
switch (c) {
case 'a':
opt::loba_algo = optarg;
switch (c) {
case 'a':
opt::loba_algo = optarg;
@@
-202,12
+203,10
@@
bool opt::parse_args(int* argc, char* argv[])
opt::comm_cost = cost_func(optarg);
break;
case 'i':
opt::comm_cost = cost_func(optarg);
break;
case 'i':
- std::istringstream(optarg) >> opt::
comp
_maxiter;
+ std::istringstream(optarg) >> opt::
lb
_maxiter;
break;
case 'I':
break;
case 'I':
- std::istringstream(optarg) >> opt::lb_maxiter;
- ERROR0("option -I not implemented yet");
- result = false;
+ std::istringstream(optarg) >> opt::comp_maxiter;
break;
case 'l':
std::istringstream(optarg) >> opt::log_rate;
break;
case 'l':
std::istringstream(optarg) >> opt::log_rate;
@@
-221,6
+220,9
@@
bool opt::parse_args(int* argc, char* argv[])
case 's':
std::istringstream(optarg) >> opt::min_iter_duration;
break;
case 's':
std::istringstream(optarg) >> opt::min_iter_duration;
break;
+ case 't':
+ std::istringstream(optarg) >> opt::time_limit;
+ break;
case 'T':
opt::auto_depl::topology = optarg;
result = opt_helper::nol_find_prefix(opt::topologies, "topology",
case 'T':
opt::auto_depl::topology = optarg;
result = opt_helper::nol_find_prefix(opt::topologies, "topology",
@@
-288,10
+290,11
@@
void opt::print()
DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
DESCR("minimum duration between iterations", "%g", min_iter_duration);
DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
DESCR("minimum duration between iterations", "%g", min_iter_duration);
- 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("maximum number of lb. iterations", "%s",
h.val_or_string(lb_maxiter, "infinity"));
+ DESCR("maximum number of comp. iterations", "%s",
+ h.val_or_string(comp_maxiter, "infinity"));
+ DESCR("time limit", "%s", h.val_or_string(time_limit, "infinity"));
DESCR("exit on close", "%s", h.on_off(exit_on_close));
INFO0("`----");
DESCR("exit on close", "%s", h.on_off(exit_on_close));
INFO0("`----");
@@
-328,7
+331,7
@@
void opt::usage()
std::clog << "\nSimulation parameters\n";
std::clog << o("-l value")
std::clog << "\nSimulation parameters\n";
std::clog << o("-l value")
- << "print current load every n-th iterations, 0 to disable"
+ << "print current load every n-th
lb
iterations, 0 to disable"
<< " (" << opt::log_rate << ")\n";
std::clog << o("-v")
<< "verbose: do not override the default logging parameters\n";
<< " (" << opt::log_rate << ")\n";
std::clog << o("-v")
<< "verbose: do not override the default logging parameters\n";
@@
-366,11
+369,14
@@
void opt::usage()
std::clog << "\nParameters for the end of the simulation\n";
std::clog << o("-i value")
std::clog << "\nParameters for the end of the simulation\n";
std::clog << o("-i value")
- << "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";
<< "maximum number of lb. iterations, 0 for infinity"
<< " (" << opt::lb_maxiter << ")\n";
+ std::clog << o("-I value")
+ << "maximum number of comp. iterations, 0 for infinity"
+ << " (" << opt::comp_maxiter << ")\n";
+ std::clog << o("-t value")
+ << "time limit (simulated time), 0 for infinity"
+ << " (" << opt::time_limit << ")\n";
std::clog << o("-e") << "exit on reception of \"close\" message\n";
if (opt::help_requested < 3)
std::clog << o("-e") << "exit on reception of \"close\" message\n";
if (opt::help_requested < 3)