Define opt::min_comp_iter_duration.

Do not use it for now.

diff --git a/options.cpp b/options.cpp
index dbfae822b7ed82068d2dff49beea00b07b425742..2509fe0f20e39107864ec390f53b3dc96f30ef9a 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -52,7 +52,8 @@ namespace opt {
     // fixme: find better defaults
     cost_func comp_cost("1e9, 0");
     cost_func comm_cost("1e6, 0");
-    double min_iter_duration = 1.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;
@@ -180,7 +181,7 @@ 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: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;
@@ -220,7 +221,10 @@ bool opt::parse_args(int* argc, char* argv[])
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
         case 's':
-            std::istringstream(optarg) >> opt::min_iter_duration;
+            std::istringstream(optarg) >> opt::min_lb_iter_duration;
+            break;
+        case 'S':
+            std::istringstream(optarg) >> opt::min_comp_iter_duration;
             break;
         case 't':
             std::istringstream(optarg) >> opt::time_limit;
@@ -291,7 +295,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",
@@ -367,8 +374,11 @@ void opt::usage()
               << "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")

diff --git a/options.h b/options.h
index fe0df828d79247c0cf68d282213dec4d4b02b55a..fbc4851a50427caa2fb609b21ee038b3de207c64 100644 (file)
--- a/options.h
+++ b/options.h
@@ -42,7 +42,8 @@ namespace opt {
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;
-    extern double min_iter_duration;
+    extern double min_lb_iter_duration;
+    extern double min_comp_iter_duration;
 
     // Parameters for the end of the simulation
     extern unsigned lb_maxiter;

diff --git a/process.cpp b/process.cpp
index 8a165c100d364bd0861267c86cdcd7dbec0e3c0e..34ddbea2b713d3071ee24d83bda4ef7c3269c6e9 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -88,7 +88,7 @@ int process::run()
             double now = MSG_get_clock();
             if (now < next_iter_after_date)
                 MSG_process_sleep(next_iter_after_date - now);
-            next_iter_after_date = MSG_get_clock() + opt::min_iter_duration;
+            next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration;
 
             ++lb_iter;
 
@@ -131,8 +131,8 @@ int process::run()
         double timeout;
         if (real_load != 0 || get_load() != prev_load_broadcast)
             timeout = 0.0;
-        else if (opt::min_iter_duration)
-            timeout = opt::min_iter_duration;
+        else if (opt::min_lb_iter_duration)
+            timeout = opt::min_lb_iter_duration;
         else
             timeout = 1.0;
         receive(timeout);