Make opt::print() more friendly to update.

diff --git a/options.cpp b/options.cpp
index 76bc997c2c2a9b7521cd6ae49bb70b4fe246edb1..86cec694b295ff958cffb5a12735fce664f1ba0f 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -80,6 +80,30 @@ namespace {
 
     // some helper functions for opt::print()
 
 
     // some helper functions for opt::print()
 

+    std::string* descr_str;
+    std::string* val_or_string_str;
+
+    void print_helper_init()
+    {
+        descr_str = new std::string;
+        val_or_string_str = new std::string;
+    }
+
+    void print_helper_destroy()
+    {
+        delete val_or_string_str;
+        delete descr_str;
+    }
+
+    const char* descr(const char* str)
+    {
+        const int descr_width = 35;
+        std::string* res = descr_str;
+        *res = str;
+        res->resize(descr_width, '.');
+        return res->c_str();
+    }
+

     const char* on_off(bool b)
     {
         return b ? "on" : "off";
     const char* on_off(bool b)
     {
         return b ? "on" : "off";


@@ -88,15 +112,15 @@ namespace {
     template <typename T>
     const char* val_or_string(const T& val, const char* str, const T& deflt = 0)
     {
     template <typename T>
     const char* val_or_string(const T& val, const char* str, const T& deflt = 0)
     {

-        static std::string res;
+        std::string* res = val_or_string_str;

         if (val != deflt) {
             std::ostringstream oss;
             oss << val;
         if (val != deflt) {
             std::ostringstream oss;
             oss << val;

-            res = oss.str();
+            *res = oss.str();

         } else {
         } else {

-            res = str;
+            *res = str;

         }
         }

-        return res.c_str();
+        return res->c_str();

     }
 
     // helper function for opt::parse_args()
     }
 
     // helper function for opt::parse_args()


@@ -223,28 +247,32 @@ bool opt::parse_args(int* argc, char* argv[])
 
 void opt::print()
 {
 
 void opt::print()
 {

+    print_helper_init();
+#define DESCR(description, format, value) \
+    INFO2("| %s: " format, descr(description), value)

     INFO0(",----[ Simulation parameters ]");
     INFO0(",----[ Simulation parameters ]");

-    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) {
+    DESCR("log rate", "%s",          val_or_string(log_rate, "disabled"));
+    DESCR("platform file", "\"%s\"", platform_file.c_str());
+    if (auto_depl::enabled) {

         INFO0("| automatic deployment enabled");
         INFO0("| automatic deployment enabled");

-        INFO1("| - topology...................: %s", opt::auto_depl::topology.c_str());
-        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"));
+        DESCR("- topology", "%s",          auto_depl::topology.c_str());
+        DESCR("- number of hosts", "%s",   val_or_string(auto_depl::nhosts,
+                                                         "auto"));
+        DESCR("- initial load", "%s",      val_or_string(auto_depl::load,
+                                                         "auto"));

     } else {
     } else {

-        INFO1("| deployment file..............: \"%s\"", opt::deployment_file.c_str());
+        DESCR("deployment file", "\"%s\"", deployment_file.c_str());

     }
     }

-    INFO1("| load balancing algorithm.....: %s",   opt::loba_algo.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.: %s",
-          val_or_string(opt::maxiter, "infinity"));
-    INFO1("| exit on close................: %s",   on_off(opt::exit_on_close));
+    DESCR("load balancing algorithm", "%s",     loba_algo.c_str());
+    DESCR("bookkeeping", "%s",                  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("maximum number of iterations", "%s",
+          val_or_string(maxiter, "infinity"));
+    DESCR("exit on close", "%s",                on_off(exit_on_close));

     INFO0("`----");
     INFO0("`----");

+#undef DESCR
+    print_helper_destroy();

 }
 
 void opt::usage()
 }
 
 void opt::usage()