X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/23529d55ccbfd0a851fdc86708320811ddda8ec4..06b0d2707f37e788c6d54a8fb49ceb4f9ec8ceba:/process.cpp?ds=sidebyside

diff --git a/process.cpp b/process.cpp
index 0544b21..80fd618 100644
--- a/process.cpp
+++ b/process.cpp
@@ -72,18 +72,13 @@ int process::run()
     VERB0("Starting...");
     comp_iter = lb_iter = 0;
     while (true) {
-        if (opt::min_iter_duration) {
+        double ld = lb_load();
+        if (ld > 0.0) {
             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(delay);
-            }
+            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;
-        }
 
-        double ld = lb_load();
-        if (ld > 0.0) {
             ++lb_iter;
 
             if (opt::log_rate && lb_iter % opt::log_rate == 0) {
@@ -123,8 +118,14 @@ int process::run()
 
         // block on receiving unless there is something to compute or
         // to send
-        bool wait = (load == 0 && lb_load() == prev_load_broadcast);
-        receive(wait);
+        double timeout;
+        if (load != 0 || lb_load() != prev_load_broadcast)
+            timeout = 0.0;
+        else if (opt::min_iter_duration)
+            timeout = opt::min_iter_duration;
+        else
+            timeout = 1.0;
+        receive(timeout);
 
         // one of our neighbor is finalizing
         if (opt::exit_on_close && close_received) {
@@ -261,13 +262,13 @@ void process::send()
     comm.flush(false);
 }
 
-void process::receive(bool wait)
+void process::receive(double timeout)
 {
     message* msg;
     m_host_t from;
 
-    DEBUG1("%sblocking receive", "\0non-" + !wait);
-    while (may_receive() && comm.recv(msg, from, wait)) {
+    DEBUG2("%sblocking receive (%g)", "\0non-" + !timeout, timeout);
+    while (may_receive() && comm.recv(msg, from, timeout)) {
         switch (msg->get_type()) {
         case message::INFO: {
             neighbor* n = rev_neigh[from];
@@ -294,7 +295,7 @@ void process::receive(bool wait)
             break;
         }
         delete msg;
-        wait = false;           // only wait on first recv
+        timeout = 0.0;          // only wait on first recv
     }
     comm.flush(false);
 }
@@ -322,7 +323,7 @@ void process::finalize()
            (unsigned long )neigh.size(), ESSE(neigh.size()));
     while (may_receive()) {
         comm.flush(false);
-        receive(true);
+        receive(-1.0);
     }
 
     comm.flush(true);