new tests

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index db84ff82704e4292284af6520e1986f838ee57f9..5d0f98bc5da9fa2532cec0cc0533414a325a146d 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -323,13 +323,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 +400,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: