+#include <ctime>
#include <iomanip>
#include <iostream>
#include <sstream>
#include "deployment.h"
#include "process.h"
-#include "loba_simple.h"
+#include "loba_besteffort.h"
#include "loba_fairstrategy.h"
#include "loba_makhoul.h"
+#include "loba_makhoul2.h"
+#include "loba_simple.h"
#include "misc.h"
#include "options.h"
+#define DATA_DESCR_WIDTH 42
+
namespace opt {
// Constants
// Simulation parameters
int log_rate = 1;
+ bool exit_request = false;
// Platform and deployment
std::string platform_file;
std::string topology("clique");
unsigned nhosts = 0;
double load = 0.0;
+ bool random_distribution = false;
+ unsigned long random_seed = 0;
}
// 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
cost_func comp_cost("1e9, 0"); // fixme: find better defaults
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("besteffort", "balance with best effort strategy",
+ loba_besteffort);
+ 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;
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();
}
int c;
opterr = 0;
while ((c = getopt(*argc, argv,
- "a:bc:C:d:D:ehi:I:l:L:N:s:S:t:T:vV")) != -1) {
+ "a:bc:C:d:D:ehi:I:l:L:m:M:N:r:Rs:S:t:T:vV")) != -1) {
switch (c) {
case 'a':
opt::loba_algo = optarg;
try {
opt::comp_cost = cost_func(optarg);
} catch (...) {
- XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+ XBT_ERROR("invalid argument for option '-%c' -- \"%s\"",
+ c, optarg);
result = false;
}
break;
try {
opt::comm_cost = cost_func(optarg);
} catch (...) {
- XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+ XBT_ERROR("invalid argument for option '-%c' -- \"%s\"",
+ c, optarg);
result = false;
}
break;
case 'L':
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':
PARSE_ARG(opt::auto_depl::nhosts);
break;
+ case 'r':
+ PARSE_ARG(opt::auto_depl::random_seed);
+ break;
+ case 'R':
+ opt::auto_depl::random_distribution =
+ !opt::auto_depl::random_distribution;
+ break;
case 's':
PARSE_ARG(opt::min_lb_iter_duration);
break;
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;
+ }
+
+ if (!opt::auto_depl::random_seed)
+ opt::auto_depl::random_seed = time(NULL);
+
return result;
}
"auto"));
DESCR("- initial load", "%s", h.val_or_string(auto_depl::load,
"auto"));
+ DESCR("- random initial load distribution", "%s",
+ h.on_off(auto_depl::random_distribution));
+ DESCR("- random seed", "%s",
+ h.val_or_string(auto_depl::random_seed, "time based"));
} else {
DESCR("deployment file", "\"%s\"", deployment_file.c_str());
}
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("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 comp. iterations", "%g", min_comp_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));
XBT_INFO("`----");
std::clog << o("-N value")
<< "number of hosts to use with auto deployment, 0 for max."
<< " [" << opt::auto_depl::nhosts << "]\n";
+ std::clog << o("-R")
+ << "toggle random initial load distribution"
+ << " [" << opt_helper::on_off(opt::auto_depl::random_distribution)
+ << "]\n";
+ std::clog << o("-r value")
+ << "random seed, 0 for using it on time()"
+ << " [" << opt::auto_depl::random_seed << "]\n";
std::clog << "\nLoad balancing algorithm\n";
std::clog << o("-a name") << "load balancing algorithm"
std::clog << o("-C [aN,...]a0")
<< "polynomial factors for communication cost"
<< " [" << opt::comm_cost.to_string() << "]\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 << "\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";
