Be more picky when parsing options.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 85c21306070f51d7b9a3fd876874dcb0ee947726..cf9bb0f7348793cfce4d70faa0bfa862b16a1ec5 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -30,7 +30,7 @@ namespace opt {
     bool version_requested = false;
 
     // Simulation parameters
-    unsigned log_rate = 1;
+    int log_rate = 1;
 
     // Platform and deployment
     std::string platform_file;
@@ -51,8 +51,9 @@ namespace opt {
     // Application parameters
     // fixme: find better defaults
     cost_func comp_cost("1e9, 0");
-    cost_func comm_cost("1, 0");
-    double min_iter_duration = 1.0;
+    cost_func comm_cost("1e6, 0");
+    double min_lb_iter_duration = 1.0;
+    double min_comp_iter_duration = 1.0;
 
     // Parameters for the end of the simulation
     unsigned lb_maxiter = 0;
@@ -92,6 +93,8 @@ namespace {
     // local helper class
     class opt_helper {
     public:
+        template <typename T>
+        static bool parse_arg(char opt, const char *arg, T& val);
         static const char* on_off(bool b);
         const char* descr(const char* str);
         template <typename T>
@@ -108,6 +111,16 @@ namespace {
 
 } // namespace
 
+template <typename T>
+bool opt_helper::parse_arg(char opt, const char *arg, T& val)
+{
+    std::istringstream str(arg);
+    bool result = (str >> val) && str.eof();
+    if (!result)
+        XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", opt, arg);
+    return result;
+}
+
 const char* opt_helper::on_off(bool b)
 {
     return b ? "on" : "off";
@@ -177,10 +190,12 @@ bool opt::parse_args(int* argc, char* argv[])
 
     opt::program_name = argv[0];
     opt::program_name.erase(0, 1 + opt::program_name.find_last_of('/'));
+
+#define PARSE_ARG(x) result = opt_helper::parse_arg(c, optarg, (x)) && result
     
     int c;
     opterr = 0;
-    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:t:T:vV")) != -1) {
+    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:S:t:T:vV")) != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
@@ -199,31 +214,44 @@ bool opt::parse_args(int* argc, char* argv[])
             opt::help_requested++;
             break;
         case 'c':
-            opt::comp_cost = cost_func(optarg);
+            try {
+                opt::comp_cost = cost_func(optarg);
+            } catch (...) {
+                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+                result = false;
+            }
             break;
         case 'C':
-            opt::comm_cost = cost_func(optarg);
+            try {
+                opt::comm_cost = cost_func(optarg);
+            } catch (...) {
+                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+                result = false;
+            }
             break;
         case 'i':
-            std::istringstream(optarg) >> opt::lb_maxiter;
+            PARSE_ARG(opt::lb_maxiter);
             break;
         case 'I':
-            std::istringstream(optarg) >> opt::comp_maxiter;
+            PARSE_ARG(opt::comp_maxiter);
             break;
         case 'l':
-            std::istringstream(optarg) >> opt::log_rate;
+            PARSE_ARG(opt::log_rate);
             break;
         case 'L':
-            std::istringstream(optarg) >> opt::auto_depl::load;
+            PARSE_ARG(opt::auto_depl::load);
             break;
         case 'N':
-            std::istringstream(optarg) >> opt::auto_depl::nhosts;
+            PARSE_ARG(opt::auto_depl::nhosts);
             break;
         case 's':
-            std::istringstream(optarg) >> opt::min_iter_duration;
+            PARSE_ARG(opt::min_lb_iter_duration);
+            break;
+        case 'S':
+            PARSE_ARG(opt::min_comp_iter_duration);
             break;
         case 't':
-            std::istringstream(optarg) >> opt::time_limit;
+            PARSE_ARG(opt::time_limit);
             break;
         case 'T':
             opt::auto_depl::topology = optarg;
@@ -245,6 +273,8 @@ bool opt::parse_args(int* argc, char* argv[])
         }
     }
 
+#undef PARSE_ARG
+
     if (opt::version_requested || opt::help_requested)
         return 1;
 
@@ -291,7 +321,10 @@ void opt::print()
     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("minimum duration between iterations", "%g", min_iter_duration);
+    DESCR("minimum duration between lb. iterations", "%g",
+          min_lb_iter_duration);
+    DESCR("minimum duration between comp. iterations", "%g",
+          min_comp_iter_duration);
     DESCR("maximum number of lb. iterations", "%s",
           h.val_or_string(lb_maxiter, "infinity"));
     DESCR("maximum number of comp. iterations", "%s",
@@ -360,15 +393,18 @@ void opt::usage()
               << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
 
     std::clog << "\nApplication parameters\n";
-    std::clog << o("-c [fn,...]f0")
+    std::clog << o("-c [aN,...]a0")
               << "polynomial factors for computation cost"
               << " [" << opt::comp_cost.to_string() << "]\n";
-    std::clog << o("-C [fn,...]f0")
+    std::clog << o("-C [aN,...]a0")
               << "polynomial factors for communication cost"
               << " [" << opt::comm_cost.to_string() << "]\n";
     std::clog << o("-s value")
-              << "minimum duration between iterations"
-              << " [" << opt::min_iter_duration << "]\n";
+              << "minimum duration between lb. iterations"
+              << " [" << opt::min_lb_iter_duration << "]\n";
+    std::clog << o("-S value")
+              << "minimum duration between comp. iterations"
+              << " [" << opt::min_comp_iter_duration << "]\n";
 
     std::clog << "\nParameters for the end of the simulation\n";
     std::clog << o("-i value")
@@ -395,7 +431,8 @@ void opt::usage()
               << "        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";
+              << "        loba : messages from load-balancer\n"
+              << "        thrd : messages from thread wrapper class\n";
 
     // std::clog << "\nMiscellaneous low-level parameters\n";