X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/526e1f382ddc9f0010c41a526f3029af769162c9..dd6e93b0d35c26c2dd9dacdf3fb964a2da2c1cb2:/process.cpp

diff --git a/process.cpp b/process.cpp
index 36bdff0..01b5e0f 100644
--- a/process.cpp
+++ b/process.cpp
@@ -24,8 +24,11 @@ double process::total_load_exit = 0.0;
 
 int process::process_counter = 0;
 double process::total_load_average;
+double process::average_load_ratio;
 double process::load_diff_threshold;
 
+std::atomic<int> process::convergence_counter(0);
+
 namespace {
 
     void sleep_until_date(double& date, double duration)
@@ -69,11 +72,17 @@ process::process(int argc, char* argv[])
 
     proc_mutex->acquire();
     process_counter++;
+    convergence_counter++;
     total_load_init += real_load;
     total_load_running += real_load;
     total_load_average = total_load_running / process_counter;
+    if (opt::avg_load_ratio >= 0.0)
+        average_load_ratio = opt::avg_load_ratio;
+    else
+        average_load_ratio = 100.0 *
+            (process_counter / -opt::avg_load_ratio) / total_load_average;
     load_diff_threshold = (opt::load_ratio_threshold +
-                           opt::avg_load_ratio * total_load_average) / 100.0;
+                           average_load_ratio * total_load_average) / 100.0;
     proc_mutex->release();
 
     ctrl_close_pending = data_close_pending = neigh.size();
@@ -115,10 +124,10 @@ process::~process()
              lb_iter, comp_iter, all_comp_iter, real_load);
     if (convergence >= 0.0)
         XBT_INFO("Convergence within %g%% was achieved at time %g",
-                 opt::avg_load_ratio, convergence);
+                 average_load_ratio, convergence);
     else
         XBT_INFO("Convergence within %g%% was not achieved",
-                 opt::avg_load_ratio);
+                 average_load_ratio);
     XBT_VERB("Expected load was: %g", expected_load);
     XBT_VERB("Total computation for this process: %g", get_comp_amount());
     print_loads(true, xbt_log_priority_debug);
@@ -291,12 +300,14 @@ void process::convergence_check()
             XBT_VERB("current load has diverged: %g (%.4g%%)",
                      real_load, 100.0 * load_diff / average);
             convergence = -1.0;
+            convergence_counter++;
         }
     } else {
         if (converged) {
             XBT_VERB("current load has converged: %g (%.4g%%)",
                      real_load,  100.0 * load_diff / average);
             convergence = MSG_get_clock();
+            convergence_counter--;
         }
     }
 }
@@ -324,6 +335,10 @@ bool process::still_running()
         XBT_VERB("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter);
         last_status = false;
 
+    } else if (opt::exit_on_convergence && convergence_counter == 0) {
+        XBT_VERB("Global convergence detected");
+        last_status = false;
+
     } else if (opt::exit_on_close && close_received) {
         XBT_VERB("Close received");
         last_status = false;