Update BUGS.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 491898d4fae320f56be3f20a2931e0d1fc98bda8..2de3016588dd2dd95e66b073eba4b59eb1ab7e18 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -50,6 +50,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 +81,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",
@@ -157,7 +160,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 +172,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 +201,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);
 }
 
@@ -297,7 +296,7 @@ void process::ctrl_send(neighbor& nb)
         debt_to_send = 0.0;
     }
     if (info_to_send != prev_load_broadcast || debt_to_send > 0.0) {
-        message* msg = new message(message::INFO, info_to_send, debt_to_send);
+        message* msg = new message(message::CTRL, info_to_send, debt_to_send);
         add_ctrl_send_mesg(msg->get_size());
         comm.ctrl_send(nb.get_ctrl_mbox(), msg);
     }
@@ -329,7 +328,7 @@ void process::data_send(neighbor& nb)
             amount = std::min(load_to_send, opt::max_transfer_amount);
         else
             amount = load_to_send;
-        message* msg = new message(message::LOAD, amount);
+        message* msg = new message(message::DATA, amount);
         add_data_send_mesg(msg->get_size());
         comm.data_send(nb.get_data_mbox(), msg);
         load_to_send -= amount;
@@ -377,17 +376,15 @@ void process::data_receive(double timeout)
 void process::handle_message(message* msg, m_host_t from)
 {
     switch (msg->get_type()) {
-    case message::INFO: {
+    case message::CTRL: {
         neighbor* n = rev_neigh[from];
         n->set_load(msg->get_amount() + n->get_to_send());
         expected_load += msg->get_credit(); // may be 0.0 if !opt::bookkeeping
         break;
     }
-    case message::LOAD: {
+    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: