Add missing include.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 47dd94a19d1030db12c4e55c1cd9683ff1560176..76524fddaec59b27d08c71c2d492a9383e1f15f9 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>


@@ -19,6 +20,9 @@ double process::total_load_init = 0.0;
 double process::total_load_running = 0.0;
 double process::total_load_exit = 0.0;
 
 double process::total_load_running = 0.0;
 double process::total_load_exit = 0.0;
 

+int process::process_counter = 0;
+double process::total_load_average;
+

 namespace {
 
     void sleep_until_date(double& date, double duration)
 namespace {
 
     void sleep_until_date(double& date, double duration)


@@ -36,6 +40,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());


@@ -46,17 +57,25 @@ process::process(int argc, char* argv[])
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 

+    // Note: there should not be race condition with the current
+    // version of Simgrid, when updating the global variables.
+

     prev_load_broadcast = -1;   // force sending of load on first send_all()
     expected_load = real_load;
     total_load_running += real_load;
     total_load_init += real_load;
     received_load = 0.0;
 
     prev_load_broadcast = -1;   // force sending of load on first send_all()
     expected_load = real_load;
     total_load_running += real_load;
     total_load_init += real_load;
     received_load = 0.0;
 

+    convergence = -1.0;
+
+    process_counter++;
+    total_load_average = total_load_running / process_counter;
+

     ctrl_close_pending = data_close_pending = neigh.size();
     close_received = false;
     finalizing = false;
 
     ctrl_close_pending = data_close_pending = neigh.size();
     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));
 
     lb_thread = new_msg_thread("loba",
                                std::bind(&process::load_balance_loop, this));


@@ -85,10 +104,17 @@ process::~process()
                "received_load is %g, but should be 0.0 !", received_load);
     if (opt::log_rate < 0)
         return;
                "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);
+    if (convergence >= 0.0)
+        XBT_INFO("Convergence within %g%% was achieved at time %g",
+                 opt::avg_load_ratio, convergence);
+    else
+        XBT_INFO("Convergence within %g%% was not achieved",
+                 opt::avg_load_ratio);

     XBT_VERB("Expected load was: %g", expected_load);
     XBT_VERB("Total computation for this process: %g", get_comp_amount());
     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()


@@ -135,7 +161,8 @@ void process::load_balance_loop()
         // nothing to do with opt::bookkeeping
 
         if (opt::log_rate && lb_iter % opt::log_rate == 0) {
         // 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);
         }
 
             XBT_VERB("... expected load: %g", expected_load);
         }
 


@@ -185,9 +212,26 @@ void process::compute_loop()
                       std::bind(&process::data_send, this, _1));
         mutex.release();
 
                       std::bind(&process::data_send, this, _1));
         mutex.release();
 

+        ++all_comp_iter;

         if (real_load == 0.0)
             continue;
 
         if (real_load == 0.0)
             continue;
 

+        double load_ratio =
+            100.0 * std::fabs(real_load / total_load_average - 1.0);
+        if (convergence >= 0.0) {
+            if (load_ratio > opt::avg_load_ratio) {
+                XBT_VERB("current load has diverged: %g (%.4g%%)",
+                         real_load, load_ratio);
+                convergence = -1.0;
+            }
+        } else {
+            if (load_ratio <= opt::avg_load_ratio) {
+                XBT_VERB("current load has converged: %g (%.4g%%)",
+                         real_load, load_ratio);
+                convergence = MSG_get_clock();
+            }
+        }
+

         // compute
         ++comp_iter;
         double flops = opt::comp_cost(real_load);
         // compute
         ++comp_iter;
         double flops = opt::comp_cost(real_load);


@@ -303,26 +347,37 @@ void process::ctrl_send(neighbor& nb)
     }
 }
 
     }
 }
 

+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;
 void process::data_send(neighbor& nb)
 {
     double load_to_send;

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

-            real_load -= load_to_send;
-        } else {
-            load_to_send = 0.0;
-        }
-    } else {
-        load_to_send = nb.get_to_send();
-        if (load_to_send >= opt::min_transfer_amount) {
-            nb.set_to_send(0.0);
-            real_load -= load_to_send;
-        } else {
-            load_to_send = 0.0;
-        }
+    } 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);

     }
     }

+    real_load -= load_to_send;

     while (load_to_send > 0.0) {
         double amount;
         if (opt::max_transfer_amount)
     while (load_to_send > 0.0) {
         double amount;
         if (opt::max_transfer_amount)


@@ -380,12 +435,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: