Remove already fixed item in TODO list.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 11129e44bb3bb0f3ec413249493df4be51431f50..1883464d5d3364427e1946388ffae150be211218 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <cmath>
 #include <functional>
 #include <iterator>
 #include <numeric>
@@ -36,6 +37,13 @@ process::process(int argc, char* argv[])
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
         throw std::invalid_argument("bad or missing initial load parameter");
 
+    double iload = std::trunc(real_load);
+    if (opt::integer_transfer && real_load != iload) {
+        XBT_WARN("Initial load %g is not an integer.  Truncate it.",
+                 real_load);
+        real_load = iload;
+    }
+
     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());
@@ -50,6 +58,7 @@ process::process(int argc, char* argv[])
     expected_load = real_load;
     total_load_running += real_load;
     total_load_init += real_load;
+    received_load = 0.0;
 
     ctrl_close_pending = data_close_pending = neigh.size();
     close_received = false;
@@ -80,6 +89,8 @@ process::~process()
 {
     delete lb_thread;
     total_load_exit += real_load;
+    xbt_assert(received_load == 0.0,
+               "received_load is %g, but should be 0.0 !", received_load);
     if (opt::log_rate < 0)
         return;
     XBT_INFO("Final load after %d:%d iterations: %g",
@@ -124,6 +135,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();
@@ -147,7 +160,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__);
@@ -157,7 +169,7 @@ void process::load_balance_loop()
                   std::bind(&process::ctrl_close, this, _1));
     while (ctrl_close_pending) {
         comm.ctrl_flush(false);
-        XBT_DEBUG("waiting for %d CTRL CLOSE", ctrl_close_pending);
+        XBT_DEBUG("waiting for %d CTRL_CLOSE", ctrl_close_pending);
         ctrl_receive(-1.0);
     }
     comm.ctrl_flush(true);
@@ -169,17 +181,14 @@ void process::compute_loop()
 
     double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
     while (still_running()) {
-        // receive
-        mutex.acquire();
-        if (real_load > 0.0)
-            data_receive(0.0);
-        else
-            data_receive(opt::min_comp_iter_duration);
-        mutex.release();
+        // receive (do not block if there is something to compute)
+        data_receive(real_load > 0.0 ? 0.0 : opt::min_comp_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();
@@ -201,20 +210,19 @@ void process::compute_loop()
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
-    // last send, for not losing load scheduled to be sent
-    std::for_each(neigh.begin(), neigh.end(),
-                  std::bind(&process::data_send, this, _1));
     finalizing = true;
-    total_load_running -= real_load;
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
                   std::bind(&process::data_close, this, _1));
     while (data_close_pending) {
         comm.data_flush(false);
-        XBT_DEBUG("waiting for %d DATA CLOSE", data_close_pending);
+        XBT_DEBUG("waiting for %d DATA_CLOSE", data_close_pending);
         data_receive(-1.0);
     }
+    real_load += received_load;
+    received_load = 0.0;
+    total_load_running -= real_load;
     comm.data_flush(true);
 }
 
@@ -303,26 +311,32 @@ 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) {
+        double excess_load;
+        if (opt::egocentric)
+            excess_load = std::max(0.0, real_load - expected_load);
+        else
+            excess_load = real_load;
+        load_to_send = compute_load_to_send(std::min(excess_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)
@@ -385,9 +399,7 @@ void process::handle_message(message* msg, m_host_t from)
     }
     case message::DATA: {
         double ld = msg->get_amount();
-        real_load += ld;
-        if (finalizing)
-            total_load_running -= ld;
+        received_load += ld;
         break;
     }
     case message::CTRL_CLOSE: