Merge INFO and CREDIT messages.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index b36b000f385309ee102c283c7139244d4c3e8a26..491898d4fae320f56be3f20a2931e0d1fc98bda8 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -286,20 +286,20 @@ void process::send(neighbor& nb, double amount)
 void process::ctrl_send(neighbor& nb)
 {
     double info_to_send = expected_load;
-    if (info_to_send != prev_load_broadcast) {
-        message* msg = new message(message::INFO, info_to_send);
-        add_ctrl_send_mesg(msg->get_size());
-        comm.ctrl_send(nb.get_ctrl_mbox(), msg);
-    }
-    if (opt::bookkeeping) {
-        double debt_to_send = nb.get_to_send();
+    double debt_to_send;
+    if (opt::bookkeeping) {     // bookkeeping
+        debt_to_send = nb.get_to_send();
         if (debt_to_send > 0.0) {
             nb.set_to_send(0.0);
             nb.set_debt(nb.get_debt() + debt_to_send);
-            message* msg = new message(message::CREDIT, debt_to_send);
-            add_ctrl_send_mesg(msg->get_size());
-            comm.ctrl_send(nb.get_ctrl_mbox(), msg);
         }
+    } else {                    // !bookkeeping
+        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);
+        add_ctrl_send_mesg(msg->get_size());
+        comm.ctrl_send(nb.get_ctrl_mbox(), msg);
     }
 }
 
@@ -380,11 +380,9 @@ void process::handle_message(message* msg, m_host_t from)
     case message::INFO: {
         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::CREDIT:
-        expected_load += msg->get_amount();
-        break;
     case message::LOAD: {
         double ld = msg->get_amount();
         real_load += ld;