X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/48de9544b7eac2f9d40ea34a42c1d1a3d7ccbbfe..e2dc20f5c76435eb341f8ba275e9f1ec8e5d5791:/process.cpp?ds=sidebyside

diff --git a/process.cpp b/process.cpp
index 2de3016..193c87b 100644
--- a/process.cpp
+++ b/process.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <cmath>
 #include <functional>
 #include <iterator>
 #include <numeric>
@@ -127,6 +128,8 @@ void process::load_balance_loop()
             ++lb_iter;
         }
 
+        ctrl_receive(0.0);
+
         mutex.acquire();
         if (!opt::bookkeeping)
             expected_load = real_load - get_sum_of_to_send();
@@ -150,7 +153,6 @@ void process::load_balance_loop()
         mutex.release();
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
-        ctrl_receive(0.0);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
@@ -302,26 +304,26 @@ void process::ctrl_send(neighbor& nb)
     }
 }
 
+double process::compute_load_to_send(double desired)
+{
+    if (opt::integer_transfer)
+        desired = std::floor(desired);
+    return desired >= opt::min_transfer_amount ? desired : 0.0;
+}
+
 void process::data_send(neighbor& nb)
 {
     double load_to_send;
     if (opt::bookkeeping) {
-        load_to_send = std::min(real_load, nb.get_debt());
-        if (load_to_send >= opt::min_transfer_amount) {
+        load_to_send = compute_load_to_send(std::min(real_load, nb.get_debt()));
+        if (load_to_send > 0.0)
             nb.set_debt(nb.get_debt() - load_to_send);
-            real_load -= load_to_send;
-        } else {
-            load_to_send = 0.0;
-        }
     } else {
-        load_to_send = nb.get_to_send();
-        if (load_to_send >= opt::min_transfer_amount) {
-            nb.set_to_send(0.0);
-            real_load -= load_to_send;
-        } else {
-            load_to_send = 0.0;
-        }
+        load_to_send = compute_load_to_send(nb.get_to_send());
+        if (load_to_send > 0.0)
+            nb.set_to_send(nb.get_to_send() - load_to_send);
     }
+    real_load -= load_to_send;
     while (load_to_send > 0.0) {
         double amount;
         if (opt::max_transfer_amount)