#include "loba_simple.h"
#include "loba_fairstrategy.h"
#include "loba_makhoul.h"
+#include "loba_makhoul2.h"
+#include "misc.h"
#include "options.h"
+#define DATA_DESCR_WIDTH 42
+
namespace opt {
// Constants
bool version_requested = false;
// Simulation parameters
- unsigned log_rate = 1;
+ int log_rate = 1;
// Platform and deployment
std::string platform_file;
// Load balancing algorithm
std::string loba_algo("simple");
bool bookkeeping = false;
+ double min_lb_iter_duration = 1.0; // fixme: find better defaults
+ double min_transfer_amount = 0.0;
+ double max_transfer_amount = 0.0;
// 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 comp_cost("1e9, 0"); // fixme: find better defaults
+ cost_func comm_cost("1e6, 0"); // fixme: find better defaults
+ double min_comp_iter_duration = 1.0; // fixme: find better defaults
+ unsigned comp_iter_delay = 0; // fixme: find better defaults
+ double comp_time_delay = 0.0; // fixme: find better defaults
// Parameters for the end of the simulation
unsigned lb_maxiter = 0;
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);
+ NOL_INSERT("fairstrategy", "balance with fair strategy",
+ loba_fairstrategy);
+ NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",
+ loba_makhoul);
+ NOL_INSERT("makhoul2", "balance with Makhoul's source code",
+ loba_makhoul2);
+ NOL_INSERT("none", "no load-balancing (for testing only)",
+ process);
+ NOL_INSERT("simple", "balance with least loaded neighbor",
+ loba_simple);
}
topologies_type topologies;
// local helper class
class opt_helper {
public:
+ template <typename T>
+ static bool parse_arg(char opt, const char *arg, T& val);
static const char* on_off(bool b);
const char* descr(const char* str);
template <typename T>
} // namespace
+template <typename T>
+bool opt_helper::parse_arg(char opt, const char *arg, T& val)
+{
+ std::istringstream str(arg);
+ bool result = (str >> val) && str.eof();
+ if (!result)
+ XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", opt, arg);
+ return result;
+}
+
const char* opt_helper::on_off(bool b)
{
return b ? "on" : "off";
const char* opt_helper::descr(const char* str)
{
- const int descr_width = 40;
std::string& res = descr_str;
res = str;
- res.resize(descr_width, '.');
+ res.resize(DATA_DESCR_WIDTH, '.');
return res.c_str();
}
}
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;
opt::program_name = argv[0];
opt::program_name.erase(0, 1 + opt::program_name.find_last_of('/'));
+
+#define PARSE_ARG(x) result = opt_helper::parse_arg(c, optarg, (x)) && result
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:d:D:ehi:I:l:L:m:M:N:s:S:t:T:vV")) != -1) {
switch (c) {
case 'a':
opt::loba_algo = optarg;
opt::help_requested++;
break;
case 'c':
- opt::comp_cost = cost_func(optarg);
+ try {
+ opt::comp_cost = cost_func(optarg);
+ } catch (...) {
+ XBT_ERROR("invalid argument for option '-%c' -- \"%s\"",
+ c, optarg);
+ result = false;
+ }
break;
case 'C':
- opt::comm_cost = cost_func(optarg);
+ try {
+ opt::comm_cost = cost_func(optarg);
+ } catch (...) {
+ XBT_ERROR("invalid argument for option '-%c' -- \"%s\"",
+ c, optarg);
+ result = false;
+ }
+ break;
+ case 'd':
+ PARSE_ARG(opt::comp_iter_delay);
+ break;
+ case 'D':
+ PARSE_ARG(opt::comp_time_delay);
break;
case 'i':
- std::istringstream(optarg) >> opt::lb_maxiter;
+ PARSE_ARG(opt::lb_maxiter);
break;
case 'I':
- std::istringstream(optarg) >> opt::comp_maxiter;
+ PARSE_ARG(opt::comp_maxiter);
break;
case 'l':
- std::istringstream(optarg) >> opt::log_rate;
+ PARSE_ARG(opt::log_rate);
break;
case 'L':
- std::istringstream(optarg) >> opt::auto_depl::load;
+ PARSE_ARG(opt::auto_depl::load);
+ break;
+ case 'm':
+ PARSE_ARG(opt::min_transfer_amount);
+ break;
+ case 'M':
+ PARSE_ARG(opt::max_transfer_amount);
break;
case 'N':
- std::istringstream(optarg) >> opt::auto_depl::nhosts;
+ PARSE_ARG(opt::auto_depl::nhosts);
break;
case 's':
- std::istringstream(optarg) >> opt::min_iter_duration;
+ PARSE_ARG(opt::min_lb_iter_duration);
+ break;
+ case 'S':
+ PARSE_ARG(opt::min_comp_iter_duration);
break;
case 't':
- std::istringstream(optarg) >> opt::time_limit;
+ PARSE_ARG(opt::time_limit);
break;
case 'T':
opt::auto_depl::topology = optarg;
opt::version_requested = true;
break;
case '?':
- ERROR1("invalid option -- '%c'", optopt);
+ XBT_ERROR("invalid option -- '%c'", optopt);
result = false;
break;
}
}
+#undef PARSE_ARG
+
if (opt::version_requested || opt::help_requested)
return 1;
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;
+ }
+
+ if (opt::max_transfer_amount &&
+ opt::max_transfer_amount < opt::min_transfer_amount) {
+ XBT_ERROR("max. data transfer amount < min. data transfer amount");
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("load balancing algorithm", "%s", loba_algo.c_str());
DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
+ DESCR("minimum duration between lb. iterations", "%g",
+ min_lb_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("minimum data transfer amount", "%g", min_transfer_amount);
+ DESCR("maximum data transfer amount", "%s",
+ h.val_or_string(max_transfer_amount, "no limit"));
+ DESCR("minimum duration between comp. iterations", "%g",
+ min_comp_iter_duration);
+ DESCR("computations start after lb. iter", "%u", comp_iter_delay);
+ DESCR("computations start after time", "%g", comp_time_delay);
DESCR("maximum number of lb. iterations", "%s",
- h.val_or_string(lb_maxiter, "infinity"));
+ h.val_or_string(lb_maxiter, "no limit"));
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"));
+ h.val_or_string(comp_maxiter, "no limit"));
+ DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));
DESCR("exit on close", "%s", h.on_off(exit_on_close));
- INFO0("`----");
+ XBT_INFO("`----");
#undef DESCR
}
so_list(opt::loba_algorithms);
std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")"
<< " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
+ std::clog << o("-s value")
+ << "minimum duration between lb. iterations"
+ << " [" << opt::min_lb_iter_duration << "]\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";
+ std::clog << o("-m value")
+ << "minimum data transfer amount"
+ << " [" << opt::min_transfer_amount << "]\n";
+ std::clog << o("-M value")
+ << "maximum data transfer amount, 0 for no limit"
+ << " [" << opt::max_transfer_amount << "]\n";
+ std::clog << o("-S value")
+ << "minimum duration between comp. iterations"
+ << " [" << opt::min_comp_iter_duration << "]\n";
+ std::clog << o("-d value")
+ << "start computations after given number of lb iterations"
+ << " [" << opt::comp_iter_delay << "]\n";
+ std::clog << o("-D value")
+ << "start computations after given time"
+ << " [" << opt::comp_time_delay << "]\n";
std::clog << "\nParameters for the end of the simulation\n";
std::clog << o("-i value")
- << "maximum number of lb. iterations, 0 for infinity"
+ << "maximum number of lb. iterations, 0 for no limit"
<< " [" << opt::lb_maxiter << "]\n";
std::clog << o("-I value")
- << "maximum number of comp. iterations, 0 for infinity"
+ << "maximum number of comp. iterations, 0 for no limit"
<< " [" << opt::comp_maxiter << "]\n";
std::clog << o("-t value")
- << "time limit (simulated time), 0 for infinity"
+ << "time limit (simulated time), 0 for no limit"
<< " [" << opt::time_limit << "]\n";
std::clog << o("-e") << "toggle exit on reception of \"close\" message"
<< " [" << opt_helper::on_off(opt::exit_on_close) << "]\n";
<< " 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";
