Take tracing API changes into account.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 01ae4470bc092cfe0e37b95efa35697690f46655..1275bcf20b0b9b0acdcc81c84c4e3b3af4b46b9f 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -80,6 +80,7 @@ namespace opt {
     unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;
     unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;

+    unsigned exit_on_convergence = 0;

     bool exit_on_close = true;
 
     // Named parameters lists
     bool exit_on_close = true;
 
     // Named parameters lists


@@ -165,25 +166,23 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
 
 const char* opt_helper::descr(const char* str)
 {

-    std::string& res = descr_str;
-    res = str;
-    res.resize(DATA_DESCR_WIDTH, '.');
-    return res.c_str();
+    descr_str = str;
+    descr_str.resize(DATA_DESCR_WIDTH, '.');
+    return descr_str.c_str();

 }
 
 template <typename T>
 const char* opt_helper::val_or_string(const T& val, const char* str,
                                       const T& deflt)
 {
 }
 
 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;
     if (val != deflt) {
         std::ostringstream oss;
         oss << val;

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

     } else {
     } else {

-        res = str;
+        val_or_string_str = str;

     }
     }

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

 }
 
 template <typename T>
 }
 
 template <typename T>


@@ -233,7 +232,7 @@ bool opt::parse_args(int* argc, char* argv[])
     opterr = 0;
     while ((c = getopt(*argc, argv,
                        "%:"
     opterr = 0;
     while ((c = getopt(*argc, argv,
                        "%:"

-                       "a:bc:C:d:D:eEhi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
+                       "a:bc:C:d:D:eEg:hi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))

            != -1) {
         switch (c) {
         case '%':
            != -1) {
         switch (c) {
         case '%':


@@ -279,6 +278,9 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'E':
             opt::egocentric = !opt::egocentric;
             break;
         case 'E':
             opt::egocentric = !opt::egocentric;
             break;

+        case 'g':
+            PARSE_ARG(opt::exit_on_convergence);
+            break;

         case 'h':
             opt::help_requested++;
             break;
         case 'h':
             opt::help_requested++;
             break;


@@ -355,13 +357,6 @@ bool opt::parse_args(int* argc, char* argv[])
 
 #undef PARSE_ARG
 
 
 #undef PARSE_ARG
 

-    if (opt::option_x) {        // FIXME: remove this one day...
-        opt::loba_best_divisor = opt::option_x;
-        XBT_WARN("divisor for algorithms *best* set from option -x (%d => %u),"
-                 " use -k instead",
-                 opt::option_x, opt::loba_best_divisor);
-    }
-

     if (opt::version_requested || opt::help_requested)
         return 1;
 
     if (opt::version_requested || opt::help_requested)
         return 1;
 


@@ -450,6 +445,8 @@ void opt::print()
           h.val_or_string(comp_maxiter, "no limit"));
     DESCR("convergence is assumed within (\%)", "%g", opt::avg_load_ratio);
     DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));
           h.val_or_string(comp_maxiter, "no limit"));
     DESCR("convergence is assumed within (\%)", "%g", opt::avg_load_ratio);
     DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));

+    DESCR("exit on convergence", "%s",
+          h.val_or_string(exit_on_convergence, "disabled"));

     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     XBT_INFO("`----");
 
     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     XBT_INFO("`----");
 


@@ -571,6 +568,15 @@ void opt::usage()
     std::clog << o("-% value")
               << "percent of the load average to assume the convergence"
               << " [" << opt::avg_load_ratio << "]\n";
     std::clog << o("-% value")
               << "percent of the load average to assume the convergence"
               << " [" << opt::avg_load_ratio << "]\n";

+    if (opt::help_requested > 1)
+        std::clog << o("")
+                  << "- if negative: use 100 * (nhosts / -value) / avg_load\n";
+    std::clog << o("-g value")
+              << "number of consecutive detections of convergence to exit"
+              << " [" << opt::exit_on_convergence << "]\n";
+    if (opt::help_requested > 1)
+        std::clog << o("")
+                  << "- use 0 to disable\n";

     std::clog << o("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";
     std::clog << o("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";