X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/ef1ef576d25c492dc585240b8a4b36954fc00140..6ff0fa0bf05608ab7edd5e2a5555f7f2eff71da5:/options.cpp?ds=sidebyside

diff --git a/options.cpp b/options.cpp
index fe78559..c4ae59a 100644
--- a/options.cpp
+++ b/options.cpp
@@ -79,87 +79,87 @@ namespace opt {
 
 namespace {
 
-    // some helper functions for opt::print()
+    // local helper class
+    class opt_helper {
+    public:
+        static const char* on_off(bool b);
+        const char* descr(const char* str);
+        template <typename T>
+        const char* val_or_string(const T& val, const char* str,
+                                  const T& deflt = 0);
+        template <typename T>
+        static bool nol_find_prefix(const T& nol, const char* descr,
+                                    std::string& name);
+
+    private:
+        std::string descr_str;
+        std::string val_or_string_str;
+    };
 
-    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;
-    }
+} // namespace
 
-    void print_helper_destroy()
-    {
-        delete val_or_string_str;
-        delete descr_str;
-    }
+const char* opt_helper::on_off(bool b)
+{
+    return b ? "on" : "off";
+}
 
-    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* opt_helper::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";
+template <typename T>
+const char* opt_helper::val_or_string(const T& val, const char* str,
+                                      const T& deflt)
+{
+    std::string& res = val_or_string_str;
+    if (val != deflt) {
+        std::ostringstream oss;
+        oss << val;
+        res = oss.str();
+    } else {
+        res = str;
     }
+    return res.c_str();
+}
 
-    template <typename T>
-    const char* val_or_string(const T& val, const char* str, const T& deflt = 0)
-    {
-        std::string* res = val_or_string_str;
-        if (val != deflt) {
-            std::ostringstream oss;
-            oss << val;
-            *res = oss.str();
-        } else {
-            *res = str;
+template <typename T>
+bool opt_helper::nol_find_prefix(const T& nol, const char* descr,
+                                 std::string& name)
+{
+    bool result = nol.exists(name);
+    if (!result) {
+        std::stack<std::string> candidates;
+        for (typename T::iterator it = nol.begin() ; it != nol.end() ; ++it) {
+            const std::string& fullname = nol.get_name(it);
+            if (fullname.compare(0, name.length(), name) == 0)
+                candidates.push(fullname);
         }
-        return res->c_str();
-    }
-
-    // helper function for opt::parse_args()
-
-    template <typename T>
-    bool nol_find_prefix(const T& nol, const char* descr, std::string& name)
-    {
-        bool result = nol.exists(name);
-        if (!result) {
-            std::stack<std::string> candidates;
-            for (typename T::iterator it = nol.begin() ; it != nol.end() ; ++it) {
-                const std::string& fullname = nol.get_name(it);
-                if (fullname.compare(0, name.length(), name) == 0)
-                    candidates.push(fullname);
-            }
-            switch (candidates.size()) {
-            case 0:
-                ERROR2("unknownw %s -- %s", descr, name.c_str());
-                break;
-            case 1:
-                name = candidates.top();
+        switch (candidates.size()) {
+        case 0:
+            ERROR2("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());
+            break;
+        default:
+            ERROR2("ambiguous %s -- %s", descr, name.c_str());
+            while (!candidates.empty()) {
+                ERROR1("  candidates are -- %s", candidates.top().c_str());
                 candidates.pop();
-                result = true;
-                DEBUG2("infered %s -- %s", descr, name.c_str());
-                break;
-            default:
-                ERROR2("ambiguous %s -- %s", descr, name.c_str());
-                while (!candidates.empty()) {
-                    ERROR1("  candidates are -- %s", candidates.top().c_str());
-                    candidates.pop();
-                }
-                break;
             }
+            break;
         }
-        return result;
     }
-
-} // namespace
+    return result;
+}
 
 bool opt::parse_args(int* argc, char* argv[])
 {
@@ -170,13 +170,14 @@ bool opt::parse_args(int* argc, char* argv[])
     
     int c;
     opterr = 0;
-    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:T:vV")) != -1) {
+    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:T:vV")) != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
-            result = nol_find_prefix(opt::loba_algorithms,
-                                     "load balancing algorithm",
-                                     opt::loba_algo);
+            result = opt_helper::nol_find_prefix(opt::loba_algorithms,
+                                                 "load balancing algorithm",
+                                                 opt::loba_algo)
+                && result;
             break;
         case 'b':
             opt::bookkeeping = true;
@@ -212,8 +213,9 @@ bool opt::parse_args(int* argc, char* argv[])
             break;
         case 'T':
             opt::auto_depl::topology = optarg;
-            result = nol_find_prefix(opt::topologies, "topology",
-                                     opt::auto_depl::topology);
+            result = opt_helper::nol_find_prefix(opt::topologies, "topology",
+                                                 opt::auto_depl::topology)
+                && result;
             break;
         case 'v':
             // nothing to do: this option is checked at the very
@@ -253,34 +255,36 @@ bool opt::parse_args(int* argc, char* argv[])
 
 void opt::print()
 {
-    print_helper_init();
+    opt_helper h;
+
 #define DESCR(description, format, value) \
-    INFO2("| %s: " format, descr(description), value)
+    INFO2("| %s: " format, h.descr(description), value)
+
     INFO0(",----[ Simulation parameters ]");
-    DESCR("log rate", "%s",          val_or_string(log_rate, "disabled"));
+    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");
         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"));
+        DESCR("- number of hosts", "%s",   h.val_or_string(auto_depl::nhosts,
+                                                           "auto"));
+        DESCR("- initial load", "%s",      h.val_or_string(auto_depl::load,
+                                                           "auto"));
     } else {
         DESCR("deployment file", "\"%s\"", deployment_file.c_str());
     }
     DESCR("load balancing algorithm", "%s",     loba_algo.c_str());
-    DESCR("bookkeeping", "%s",                  on_off(bookkeeping));
+    DESCR("bookkeeping", "%s",                  h.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 comp. iterations", "%s",
-          val_or_string(comp_maxiter, "infinity"));
+          h.val_or_string(comp_maxiter, "infinity"));
     DESCR("maximum number of lb. iterations", "%s",
-          val_or_string(lb_maxiter, "infinity"));
-    DESCR("exit on close", "%s",                on_off(exit_on_close));
+          h.val_or_string(lb_maxiter, "infinity"));
+    DESCR("exit on close", "%s",                h.on_off(exit_on_close));
     INFO0("`----");
+
 #undef DESCR
-    print_helper_destroy();
 }
 
 void opt::usage()
@@ -367,6 +371,8 @@ void opt::usage()
               << "        proc : messages from base process class\n"
               << "        loba : messages from load-balancer\n";
 
+    // std::clog << "\nMiscellaneous low-level parameters\n";
+
 #undef so_list
 #undef so
 #undef o