mise a jour du fichier expe raph (loba_makhoul.cpp pas modifié, j'avais essayé l...

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 45d06211d7c830d475d4fa01d54c0315cc5c1f70..5d0f98bc5da9fa2532cec0cc0533414a325a146d 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
 #include <algorithm>

+#include <cmath>

 #include <functional>
 #include <iterator>
 #include <numeric>
 #include <functional>
 #include <iterator>
 #include <numeric>


@@ -36,6 +37,13 @@ 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");
 
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
         throw std::invalid_argument("bad or missing initial load parameter");
 

+    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);
+        real_load = iload;
+    }
+

     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());
     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());


@@ -89,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());
              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()
 }
 
 int process::run()


@@ -305,17 +314,30 @@ void process::ctrl_send(neighbor& nb)
 
 double process::compute_load_to_send(double desired)
 {
 
 double process::compute_load_to_send(double desired)
 {

+    if (opt::integer_transfer)
+        desired = std::floor(desired);

     return desired >= opt::min_transfer_amount ? desired : 0.0;
 }
 
 void process::data_send(neighbor& nb)
 {
     double load_to_send;
     return desired >= opt::min_transfer_amount ? desired : 0.0;
 }
 
 void process::data_send(neighbor& nb)
 {
     double load_to_send;

-    if (opt::bookkeeping) {
-        load_to_send = compute_load_to_send(std::min(real_load, nb.get_debt()));
+    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);
         if (load_to_send > 0.0)
             nb.set_debt(nb.get_debt() - load_to_send);

-    } else {
+    } 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);
         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);


@@ -378,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());
     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: {
         break;
     }
     case message::DATA: {

+        neighbor* n = rev_neigh[from];

         double ld = msg->get_amount();
         received_load += ld;
         double ld = msg->get_amount();
         received_load += ld;

+        n->set_credit(n->get_credit() - ld);

         break;
     }
     case message::CTRL_CLOSE:
         break;
     }
     case message::CTRL_CLOSE: