From 6c5ce85989b0976bbd0a663344cc270433ec1b28 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 16 Dec 2010 15:55:50 +0100
Subject: [PATCH] Improved printing of simulation parameters, and fixed some
defaults.
---
main.cpp | 6 ++++++
options.cpp | 48 ++++++++++++++++++++++++++++++++++--------------
version.cpp | 17 ++++++++++++-----
version.h | 10 ++++++----
4 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/main.cpp b/main.cpp
index 490b52e..401a51a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -80,6 +80,7 @@ int main(int argc, char* argv[])
MSG_clean();
exit(parse_res ? EXIT_NO_FAILURE : EXIT_FAILURE_ARGS);
}
+ INFO3("%s v%s (%s)", opt::program_name.c_str(), version::num.c_str(), version::date.c_str());
opt::print();
TRY {
@@ -95,6 +96,11 @@ int main(int argc, char* argv[])
if (opt::auto_depl::enabled) {
if (!opt::auto_depl::nhosts)
opt::auto_depl::nhosts = hostdata::size();
+ if (opt::auto_depl::nhosts > hostdata::size()) {
+ WARN2("%u hosts is too much: limiting to %u",
+ opt::auto_depl::nhosts, (unsigned )hostdata::size());
+ opt::auto_depl::nhosts = hostdata::size();
+ }
if (!opt::auto_depl::load)
opt::auto_depl::load = opt::auto_depl::nhosts;
MY_launch_application(); // it is already opt::* aware...
diff --git a/options.cpp b/options.cpp
index 668aed3..e4d1236 100644
--- a/options.cpp
+++ b/options.cpp
@@ -38,7 +38,7 @@ namespace opt {
// 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
@@ -66,15 +66,6 @@ namespace opt {
} // namespace opt
-namespace {
-
- const char* on_off(bool b)
- {
- return b ? "on" : "off";
- }
-
-}
-
int opt::parse_args(int* argc, char* argv[])
{
int result = 1;
@@ -161,16 +152,44 @@ int opt::parse_args(int* argc, char* argv[])
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());
}
@@ -178,7 +197,8 @@ void opt::print()
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("`----");
}
diff --git a/version.cpp b/version.cpp
index 9f1a023..344386d 100644
--- a/version.cpp
+++ b/version.cpp
@@ -2,12 +2,19 @@
namespace version {
- const char name[] = "Asynchronous Load Balancing";
- const char num[] = "0x00"
+ const std::string name
+ ("Asynchronous Load Balancing");
+
+ const std::string num
+ ("0x00"
#include "localversion"
-;
- const char date[] = __DATE__ " " __TIME__;
- const char copyright[] = "Copyright (c) 2010, Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>";
+ );
+
+ const std::string date
+ (__DATE__ " " __TIME__);
+
+ const std::string copyright
+ ("Copyright (c) 2010, Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>");
}
diff --git a/version.h b/version.h
index 8bb146a..5db0d97 100644
--- a/version.h
+++ b/version.h
@@ -1,12 +1,14 @@
#ifndef VERSION_H
#define VERSION_H
+#include <string>
+
namespace version {
- extern const char name[];
- extern const char num[];
- extern const char date[];
- extern const char copyright[];
+ extern const std::string name;
+ extern const std::string num;
+ extern const std::string date;
+ extern const std::string copyright;
}
--
2.39.5