X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/dbc9221771e3158336126009aff945e86acca5da..ef5d9613299a5a47244f7edec76d0dfc70edfddc:/process.cpp?ds=inline

diff --git a/process.cpp b/process.cpp
index 306687f..0b27f0b 100644
--- a/process.cpp
+++ b/process.cpp
@@ -75,17 +75,17 @@ int process::run()
 {
     INFO1("Initial load: %g", load);
     VERB0("Starting...");
-    iter = 0;
+    comp_iter = lb_iter = 0;
     while (true) {
         if (load > 0.0) {
-            ++iter;
-            if (opt::log_rate && iter % opt::log_rate == 0) {
+            ++comp_iter;
+            if (opt::log_rate && comp_iter % opt::log_rate == 0) {
                 if (opt::bookkeeping)
-                    INFO3("(%u) current load: %g ; expected: %g",
-                          iter, load, expected_load);
+                    INFO4("(%u:%u) current load: %g ; expected: %g",
+                          comp_iter, lb_iter, load, expected_load);
                 else
                     INFO2("(%u) current load: %g",
-                          iter, load);
+                          comp_iter, load);
             }
 
             if (opt::bookkeeping)
@@ -98,13 +98,16 @@ int process::run()
             send();
             compute();
 
-            if (opt::maxiter && iter >= opt::maxiter)
-                break;
         } else {
             // send load information, and load when bookkeeping
             send();
         }
 
+        if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter)
+            break;
+        if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter)
+            break;
+
         // block on receiving unless there is something to compute or
         // to send
         bool recv_wait = (load == 0 &&
@@ -123,6 +126,7 @@ int process::run()
 
         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!
+        // fixme: should this chunk be moved before call to receive() ?
         if (100.0 * total_load_running / total_load_init <=
             opt::load_ratio_threshold) {
             VERB0("No more load to balance in system, stopping.");
@@ -140,7 +144,8 @@ int process::run()
      */
 
     VERB0("Done.");
-    INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);
+    INFO3("Final load after %d iteration%s: %g",
+          comp_iter, ESSE(comp_iter), load);
     if (opt::bookkeeping)
         INFO1("Expected load: %g", expected_load);
     return 0;
@@ -159,7 +164,7 @@ double process::sum_of_to_send() const
 
 double process::load_balance(double /*my_load*/)
 {
-    if (iter == 1)
+    if (lb_iter == 1)           // warn only once
         WARN0("process::load_balance is a no-op!");
     return 0.0;
 }