X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/f5336c506a2c288f6a4a9ed84ecb21b12a22a2dd..0ebfaf6eb40a90d31baa3813c891eb7261e818d2:/process.cpp?ds=sidebyside

diff --git a/process.cpp b/process.cpp
index 04c08c0..5d0f98b 100644
--- a/process.cpp
+++ b/process.cpp
@@ -37,7 +37,7 @@ 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 = trunc(real_load);
+    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);
@@ -97,6 +97,7 @@ process::~process()
              lb_iter, 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);
 }
 
 int process::run()
@@ -321,16 +322,22 @@ double process::compute_load_to_send(double desired)
 void process::data_send(neighbor& nb)
 {
     double load_to_send;
-    if (opt::bookkeeping) {
-        double excess_load = real_load - expected_load;
-        if (excess_load > 0.0) {
-            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);
-        } else
-            load_to_send = 0.0;
-    } else {
+    if (opt::bookkeeping) {     // bookkeeping
+        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;
+
+        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
         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);
@@ -393,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: