From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 24 Oct 2011 14:29:55 +0000 (+0200)
Subject: Revert "Use a do..while() loop instead of this ugly continue statement."
X-Git-Tag: exp_20120216~8
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/94b462631204e69491f6cb175ca210830bb11088?ds=sidebyside

Revert "Use a do..while() loop instead of this ugly continue statement."

The still_running() check was missed with the do..while() loop!

This reverts commit f8daec44188cc69bbd5b05a1eebfb813a07ae495.

Conflicts:

	process.cpp
---

diff --git a/process.cpp b/process.cpp
index 48dac1d..c85b605 100644
--- a/process.cpp
+++ b/process.cpp
@@ -220,25 +220,23 @@ void process::compute_loop()
     double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
     double idle_since_date = 0.0;
     while (still_running()) {
+        // receive
+        // if there is something to compute, do not block
+        // else, block the duration of an *lb* iteration
+        data_receive(real_load > 0.0 ? 0.0 : opt::min_lb_iter_duration);
 
-        do {
-            // receive
-            // if there is something to compute, do not block
-            // else, block the duration of an *lb* iteration
-            data_receive(real_load > 0.0 ? 0.0 : opt::min_lb_iter_duration);
-
-            // send
-            comm.data_flush(false);
-            mutex.acquire();
-            real_load += received_load;
-            received_load = 0.0;
-            std::for_each(neigh.begin(), neigh.end(),
-                          std::bind(&process::data_send, this, _1));
-            mutex.release();
-
-            ++all_comp_iter;
+        // send
+        comm.data_flush(false);
+        mutex.acquire();
+        real_load += received_load;
+        received_load = 0.0;
+        std::for_each(neigh.begin(), neigh.end(),
+                      std::bind(&process::data_send, this, _1));
+        mutex.release();
 
-        } while (real_load == 0.0);
+        ++all_comp_iter;
+        if (real_load == 0.0)
+            continue;
 
         convergence_check();