-#include "options.h"
-
#include <iomanip>
#include <iostream>
#include <sstream>
#include <unistd.h> // getopt
#include <xbt/log.h>
-#include "loba_simple.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
+#include "loba_simple.h"
+#include "loba_fairstrategy.h"
+
+#include "options.h"
+
namespace opt {
// Global options
// Application parameters
cost_func comp_cost("1e9, 0"); // fixme: find better defaults
cost_func comm_cost("1, 0"); // fixme: find better defaults
- unsigned maxiter = 4; // fixme
+ unsigned maxiter = 10; // fixme: find better defaults
bool exit_on_close = false;
// Named parameters lists
loba_algorithms_type loba_algorithms;
loba_algorithms_type::loba_algorithms_type()
{
- NOL_INSERT("none", "no load-balancing (for testing)", process);
+ NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
+ NOL_INSERT("none", "no load-balancing (for testing only)", process);
NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
}
topologies_type topologies;
topologies_type::topologies_type()
{
- NOL_INSERT("btree", "binary tree topologym intiial load at root",
+ NOL_INSERT("btree", "binary tree topology, initial load at root",
deployment_btree);
NOL_INSERT("clique", "all connected topology", deployment_clique);
NOL_INSERT("hcube", "hypercube topology", deployment_hcube);
NOL_INSERT("ring", "ring topology", deployment_ring);
NOL_INSERT("star", "star topology, initial load at center",
deployment_star);
- // NOL_INSERT("torus", "torus topology", deployment_torus);
+ NOL_INSERT("torus", "torus topology", deployment_torus);
}
} // namespace opt
-namespace {
-
- const char* on_off(bool b)
- {
- return b ? "on" : "off";
- }
-
-}
-
int opt::parse_args(int* argc, char* argv[])
{
int result = 1;
int c;
opterr = 0;
- while ((c = getopt(*argc, argv, "a:bc:C:ehi:l:L:N:T:V")) != -1) {
+ while ((c = getopt(*argc, argv, "a:bc:C:ehi:l:L:N:T:vV")) != -1) {
switch (c) {
case 'a':
opt::loba_algo = optarg;
result = 0;
}
break;
+ case 'v':
+ // nothing to do: this option is checked at the very
+ // beginning of main()
+ break;
case 'V':
opt::version_requested = true;
break;
return result;
}
+namespace {
+
+ // some helper functions for opt::print()
+
+ const char* on_off(bool b)
+ {
+ return b ? "on" : "off";
+ }
+
+ template <typename T>
+ const char* val_or_string(const T& val, const char* str, const T& deflt = 0)
+ {
+ static std::string res;
+ if (val != deflt) {
+ std::ostringstream oss;
+ oss << val;
+ res = oss.str();
+ } else {
+ res = str;
+ }
+ return res.c_str();
+ }
+
+} // namespace
+
void opt::print()
{
INFO0(",----[ Simulation parameters ]");
- INFO1("| log rate.....................: %u", opt::log_rate);
+ INFO1("| log rate.....................: %s",
+ val_or_string(opt::log_rate, "disabled"));
INFO1("| platform file................: \"%s\"", opt::platform_file.c_str());
if (opt::auto_depl::enabled) {
INFO0("| automatic deployment enabled");
INFO1("| - topology...................: %s", opt::auto_depl::topology.c_str());
- INFO1("| - number of hosts............: %u", opt::auto_depl::nhosts);
- INFO1("| - initial load...............: %g", opt::auto_depl::load);
+ INFO1("| - number of hosts............: %s",
+ val_or_string(opt::auto_depl::nhosts, "auto"));
+ INFO1("| - initial load...............: %s",
+ val_or_string(opt::auto_depl::load, "auto"));
} else {
INFO1("| deployment file..............: \"%s\"", opt::deployment_file.c_str());
}
INFO1("| bookkeeping..................: %s", on_off(opt::bookkeeping));
INFO1("| computation cost factors.....: [%s]", opt::comp_cost.to_string().c_str());
INFO1("| communication cost factors...: [%s]", opt::comm_cost.to_string().c_str());
- INFO1("| maximum number of iterations.: %u", opt::maxiter);
+ INFO1("| maximum number of iterations.: %s",
+ val_or_string(opt::maxiter, "infinity"));
INFO1("| exit on close................: %s", on_off(opt::exit_on_close));
INFO0("`----");
}
std::clog << "\nGlobal options\n";
std::clog << o("-h")
- << "print help and exit (use -hh for extended help)\n";
+ << "print help and exit (use -hh or -hhh for extended help)\n";
if (opt::help_requested < 1)
return;
std::clog << o("-l value")
<< "print current load every n-th iterations, 0 to disable"
<< " (" << opt::log_rate << ")\n";
+ std::clog << o("-v")
+ << "verbose: do not override the default logging parameters\n";
std::clog << "\nAutomatic deployment options\n";
std::clog << o("-T name")
<< "maximum number of iterations, 0 for infinity"
<< " (" << opt::maxiter << ")\n";
+ if (opt::help_requested < 3)
+ return;
+
+ std::clog << "\nLogging support\n"
+ << " See SimGrid documentation on:\n"
+ << " http://simgrid.gforge.inria.fr/doc/group__XBT__log.html#log_user\n"
+ << " Existing categories are:\n"
+ << " simu : root of following categories\n"
+ << " main : messages from global infrastructure\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";
+
#undef so_list
#undef so
#undef o
