Consolidate helper functions from options.cpp in one block.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index a8178a9e6c8231237b393afbdae542580a3ec9ad..76bc997c2c2a9b7521cd6ae49bb70b4fe246edb1 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -1,6 +1,7 @@
 #include <iomanip>
 #include <iostream>
 #include <sstream>
+#include <stack>
 #include <unistd.h>             // getopt
 #include <xbt/log.h>
 
@@ -13,6 +14,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 namespace opt {
 
+    // Constants
+
+    // A sum of loads if considered null if it is less than
+    // load_ratio_threshold percent of the sum of loads at init.
+    const double load_ratio_threshold = 1e-4;
+
     // Global options
     std::string program_name;
     int help_requested = 0;
@@ -48,14 +55,14 @@ namespace opt {
     loba_algorithms_type::loba_algorithms_type()
     {
         NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
-        NOL_INSERT("none", "no load-balancing (for testing)", process);
+        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);
@@ -69,9 +76,69 @@ namespace opt {
 
 } // namespace opt
 
-int opt::parse_args(int* argc, char* argv[])
+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();
+    }
+
+    // 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();
+                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;
+            }
+        }
+        return result;
+    }
+
+} // namespace
+
+bool opt::parse_args(int* argc, char* argv[])
 {
-    int result = 1;
+    bool result = true;
 
     opt::program_name = argv[0];
     opt::program_name.erase(0, 1 + opt::program_name.find_last_of('/'));
@@ -82,11 +149,9 @@ int opt::parse_args(int* argc, char* argv[])
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
-            if (!opt::loba_algorithms.exists(opt::loba_algo)) {
-                ERROR1("unknownw load balancing algorithm -- %s",
-                       opt::loba_algo.c_str());
-                result = 0;
-            }
+            result = nol_find_prefix(opt::loba_algorithms,
+                                     "load balancing algorithm",
+                                     opt::loba_algo);
             break;
         case 'b':
             opt::bookkeeping = true;
@@ -116,12 +181,9 @@ int opt::parse_args(int* argc, char* argv[])
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
         case 'T':
-            opt::auto_depl::topology = optarg; 
-            if (!opt::topologies.exists(opt::auto_depl::topology)) {
-                ERROR1("unknownw topology -- %s",
-                       opt::auto_depl::topology.c_str());
-                result = 0;
-            }
+            opt::auto_depl::topology = optarg;
+            result = nol_find_prefix(opt::topologies, "topology",
+                                     opt::auto_depl::topology);
             break;
         case 'v':
             // nothing to do: this option is checked at the very
@@ -132,7 +194,7 @@ int opt::parse_args(int* argc, char* argv[])
             break;
         case '?':
             ERROR1("invalid option -- '%c'", optopt);
-            result = 0;
+            result = false;
             break;
         }
     }
@@ -144,7 +206,7 @@ int opt::parse_args(int* argc, char* argv[])
         opt::platform_file = argv[optind++];
     } else {
         ERROR0("missing parameter -- <plaform_file>");
-        result = 0;
+        result = false;
     }
     if (optind < *argc) {
         opt::deployment_file = argv[optind++];
@@ -153,37 +215,12 @@ int opt::parse_args(int* argc, char* argv[])
 
     while (optind < *argc) {
         ERROR1("unused parameter -- \"%s\"", argv[optind++]);
-        result = 0;
+        result = false;
     }
 
     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 ]");