#include "process.h"
#include "loba_simple.h"
#include "loba_fairstrategy.h"
+#include "loba_makhoul.h"
+#include "misc.h"
#include "options.h"
// Application parameters
// fixme: find better defaults
cost_func comp_cost("1e9, 0");
- cost_func comm_cost("1, 0");
- double min_iter_duration = 1.0;
+ cost_func comm_cost("1e6, 0");
+ double min_lb_iter_duration = 1.0;
+ double min_comp_iter_duration = 1.0;
// Parameters for the end of the simulation
- // fixme: find better defaults
- unsigned lb_maxiter = 10;
+ unsigned lb_maxiter = 0;
unsigned comp_maxiter = 0;
double time_limit = 0;
- bool exit_on_close = false;
+ bool exit_on_close = true;
// Named parameters lists
loba_algorithms_type loba_algorithms;
loba_algorithms_type::loba_algorithms_type()
{
NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
+ NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm", loba_makhoul);
NOL_INSERT("none", "no load-balancing (for testing only)", process);
NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
}
}
switch (candidates.size()) {
case 0:
- ERROR2("unknownw %s -- %s", descr, name.c_str());
+ XBT_ERROR("unknownw %s -- %s", descr, name.c_str());
break;
case 1:
name = candidates.top();
candidates.pop();
result = true;
- DEBUG2("infered %s -- %s", descr, name.c_str());
+ XBT_DEBUG("infered %s -- %s", descr, name.c_str());
break;
default:
- ERROR2("ambiguous %s -- %s", descr, name.c_str());
+ XBT_ERROR("ambiguous %s -- %s", descr, name.c_str());
while (!candidates.empty()) {
- ERROR1(" candidates are -- %s", candidates.top().c_str());
+ XBT_ERROR(" candidates are -- %s", candidates.top().c_str());
candidates.pop();
}
break;
int c;
opterr = 0;
- while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:t:T:vV")) != -1) {
+ while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:S:t:T:vV")) != -1) {
switch (c) {
case 'a':
opt::loba_algo = optarg;
&& result;
break;
case 'b':
- opt::bookkeeping = true;
+ opt::bookkeeping = !opt::bookkeeping;
break;
case 'e':
- opt::exit_on_close = true;
+ opt::exit_on_close = !opt::exit_on_close;
break;
case 'h':
opt::help_requested++;
std::istringstream(optarg) >> opt::auto_depl::nhosts;
break;
case 's':
- std::istringstream(optarg) >> opt::min_iter_duration;
+ std::istringstream(optarg) >> opt::min_lb_iter_duration;
+ break;
+ case 'S':
+ std::istringstream(optarg) >> opt::min_comp_iter_duration;
break;
case 't':
std::istringstream(optarg) >> opt::time_limit;
opt::version_requested = true;
break;
case '?':
- ERROR1("invalid option -- '%c'", optopt);
+ XBT_ERROR("invalid option -- '%c'", optopt);
result = false;
break;
}
if (optind < *argc) {
opt::platform_file = argv[optind++];
} else {
-
ERROR0("missing parameter -- <plaform_file>");
+
XBT_ERROR("missing parameter -- <plaform_file>");
result = false;
}
if (optind < *argc) {
opt::auto_depl::enabled = opt::deployment_file.empty();
while (optind < *argc) {
- ERROR1("unused parameter -- \"%s\"", argv[optind++]);
+ XBT_ERROR("unused parameter -- \"%s\"", argv[optind++]);
result = false;
}
opt_helper h;
#define DESCR(description, format, value) \
- INFO2("| %s: " format, h.descr(description), value)
+ XBT_INFO("| %s: " format, h.descr(description), value)
- INFO0(",----[ Simulation parameters ]");
+ XBT_INFO(",----[ Simulation parameters ]");
DESCR("log rate", "%s", h.val_or_string(log_rate, "disabled"));
DESCR("platform file", "\"%s\"", platform_file.c_str());
if (auto_depl::enabled) {
- INFO0("| automatic deployment enabled");
+ XBT_INFO("| automatic deployment enabled");
DESCR("- topology", "%s", auto_depl::topology.c_str());
DESCR("- number of hosts", "%s", h.val_or_string(auto_depl::nhosts,
"auto"));
DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
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("minimum duration between lb. iterations", "%g",
+ min_lb_iter_duration);
+ DESCR("minimum duration between comp. iterations", "%g",
+ min_comp_iter_duration);
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("`----");
+ XBT_INFO("`----");
#undef DESCR
}
<< " [" << opt::loba_algo << "]\n";
if (opt::help_requested > 1)
so_list(opt::loba_algorithms);
- std::clog << o("-b") << "enable bookkeeping (\"virtual load\")\n";
+ std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")"
+ << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
std::clog << "\nApplication parameters\n";
- std::clog << o("-c [fn,...]f0")
+ std::clog << o("-c [aN,...]a0")
<< "polynomial factors for computation cost"
<< " [" << opt::comp_cost.to_string() << "]\n";
- std::clog << o("-C [fn,...]f0")
+ std::clog << o("-C [aN,...]a0")
<< "polynomial factors for communication cost"
<< " [" << opt::comm_cost.to_string() << "]\n";
std::clog << o("-s value")
- << "minimum duration between iterations"
- << " [" << opt::min_iter_duration << "]\n";
+ << "minimum duration between lb. iterations"
+ << " [" << opt::min_lb_iter_duration << "]\n";
+ std::clog << o("-S value")
+ << "minimum duration between comp. iterations"
+ << " [" << opt::min_comp_iter_duration << "]\n";
std::clog << "\nParameters for the end of the simulation\n";
std::clog << o("-i value")
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";
+ std::clog << o("-e") << "toggle exit on reception of \"close\" message"
+ << " [" << opt_helper::on_off(opt::exit_on_close) << "]\n";
if (opt::help_requested < 3)
return;
<< " depl : messages from auto deployment (inherited from main)\n"
<< " comm : messages from asynchronous pipes\n"
<< " proc : messages from base process class\n"
- << " loba : messages from load-balancer\n";
+ << " loba : messages from load-balancer\n"
+ << " thrd : messages from thread wrapper class\n";
// std::clog << "\nMiscellaneous low-level parameters\n";
