X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/6ad1e94466f69183cec5ce63db62c248e00e5db6..21819915856816637b4cb91ff4000d139a914b2e:/process.cpp?ds=inline

diff --git a/process.cpp b/process.cpp
index db84ff8..07372dc 100644
--- a/process.cpp
+++ b/process.cpp
@@ -64,7 +64,7 @@ process::process(int argc, char* argv[])
     close_received = false;
     finalizing = false;
 
-    comp_iter = lb_iter = 0;
+    all_comp_iter = comp_iter = lb_iter = 0;
 
     lb_thread = new_msg_thread("loba",
                                std::bind(&process::load_balance_loop, this));
@@ -93,8 +93,8 @@ process::~process()
                "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",
-             lb_iter, comp_iter, real_load);
+    XBT_INFO("Final load after %d:%d:%d iterations: %g",
+             lb_iter, comp_iter, all_comp_iter, real_load);
     XBT_VERB("Expected load was: %g", expected_load);
     XBT_VERB("Total computation for this process: %g", get_comp_amount());
     print_loads(true, xbt_log_priority_debug);
@@ -144,7 +144,8 @@ void process::load_balance_loop()
         // nothing to do with opt::bookkeeping
 
         if (opt::log_rate && lb_iter % opt::log_rate == 0) {
-            XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
+            XBT_INFO("(%u:%u:%u) current load: %g",
+                     lb_iter, comp_iter, all_comp_iter, real_load);
             XBT_VERB("... expected load: %g", expected_load);
         }
 
@@ -194,6 +195,7 @@ void process::compute_loop()
                       std::bind(&process::data_send, this, _1));
         mutex.release();
 
+        ++all_comp_iter;
         if (real_load == 0.0)
             continue;
 
@@ -323,13 +325,18 @@ void process::data_send(neighbor& nb)
 {
     double load_to_send;
     if (opt::bookkeeping) {     // bookkeeping
-        double excess_load;
+        double excess_load;     // load amount we are able to send
         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()));
+
+        double balance = nb.get_debt() - nb.get_credit();
+        load_to_send = std::min(excess_load,
+                                std::max(0.0, balance));
+
+        // adjust load to send (rounding, truncation, etc.)
+        load_to_send = compute_load_to_send(load_to_send);
         if (load_to_send > 0.0)
             nb.set_debt(nb.get_debt() - load_to_send);
     } else {                    // !bookkeeping
@@ -395,12 +402,18 @@ void process::handle_message(message* msg, m_host_t from)
     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
+        if (opt::bookkeeping) {
+            double credit = msg->get_credit();
+            expected_load += credit;
+            n->set_credit(n->get_credit() + credit);
+        }
         break;
     }
     case message::DATA: {
+        neighbor* n = rev_neigh[from];
         double ld = msg->get_amount();
         received_load += ld;
+        n->set_credit(n->get_credit() - ld);
         break;
     }
     case message::CTRL_CLOSE: