From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 18 Jan 2011 09:59:49 +0000 (+0100)
Subject: Add option "-s" for controlling the minimum duration between iterations.
X-Git-Tag: v0.1~188^2~37
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/99ec08fb32d4b65c88628e45f9ebdb26741b9674

Add option "-s" for controlling the minimum duration between iterations.
---

diff --git a/TODO b/TODO
index 25c3797..6fedf48 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 * verify bookkeeping version.
 
-* add minimum (sleep) time between 2 lb iterations ?
-
 * add options -j/-J : minimum number of iterations ?
 
 * add a variant to (not) change neighbor load information at send.
diff --git a/options.cpp b/options.cpp
index 6a6a887..1a3db2c 100644
--- a/options.cpp
+++ b/options.cpp
@@ -50,6 +50,7 @@ namespace opt {
     // fixme: find better defaults
     cost_func comp_cost("1e9, 0");
     cost_func comm_cost("1, 0");
+    double min_iter_duration = 1.0;
 
     // Parameters for the end of the simulation
     // fixme: find better defaults
@@ -111,7 +112,7 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
-    const int descr_width = 35;
+    const int descr_width = 40;
     std::string& res = descr_str;
     res = str;
     res.resize(descr_width, '.');
@@ -176,7 +177,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: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;
@@ -217,6 +218,9 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'N':
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
+        case 's':
+            std::istringstream(optarg) >> opt::min_iter_duration;
+            break;
         case 'T':
             opt::auto_depl::topology = optarg;
             result = opt_helper::nol_find_prefix(opt::topologies, "topology",
@@ -283,6 +287,7 @@ 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("maximum number of comp. iterations", "%s",
           h.val_or_string(comp_maxiter, "infinity"));
     DESCR("maximum number of lb. iterations", "%s",
@@ -355,6 +360,9 @@ void opt::usage()
     std::clog << o("-C [fn,...]f0")
               << "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";
 
     std::clog << "\nParameters for the end of the simulation\n";
     std::clog << o("-i value")
diff --git a/options.h b/options.h
index d507208..de642a9 100644
--- a/options.h
+++ b/options.h
@@ -42,6 +42,7 @@ namespace opt {
     // Application parameters
     extern cost_func comp_cost;
     extern cost_func comm_cost;
+    extern double min_iter_duration;
 
     // Parameters for the end of the simulation
     extern unsigned comp_maxiter;
diff --git a/process.cpp b/process.cpp
index 23c7abf..34590f3 100644
--- a/process.cpp
+++ b/process.cpp
@@ -65,10 +65,21 @@ process::~process()
 
 int process::run()
 {
+    double next_iter_after_date = 0.0;
     INFO1("Initial load: %g", load);
     VERB0("Starting...");
     comp_iter = lb_iter = 0;
     while (true) {
+        if (opt::min_iter_duration) {
+            double now = MSG_get_clock();
+            if (now < next_iter_after_date){
+                double delay = next_iter_after_date - now;
+                DEBUG1("sleeping for %g s", delay);
+                MSG_process_sleep(next_iter_after_date - now);
+            }
+            next_iter_after_date = MSG_get_clock() + opt::min_iter_duration;
+        }
+
         if (load > 0.0) {
             ++comp_iter;
             if (opt::log_rate && comp_iter % opt::log_rate == 0) {