X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/00e9c7c4aa9f01d944398d68a05225c7782eb089..9793054ae3d7e158930379655cdc881879934441:/process.cpp

diff --git a/process.cpp b/process.cpp
index e5ba3cd..6549638 100644
--- a/process.cpp
+++ b/process.cpp
@@ -58,9 +58,9 @@ process::process(int argc, char* argv[])
 
     comp_iter = lb_iter = 0;
 
-    compute_thread = new_msg_thread("compute",
-                                    std::tr1::bind(&process::compute_loop,
-                                                   this));
+    lb_thread = new_msg_thread("loba",
+                               std::tr1::bind(&process::load_balance_loop,
+                                              this));
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
@@ -80,8 +80,10 @@ process::process(int argc, char* argv[])
 
 process::~process()
 {
-    delete compute_thread;
+    delete lb_thread;
     total_load_exit += real_load;
+    if (opt::log_rate < 0)
+        return;
     if (opt::bookkeeping) {
         XBT_INFO("Final load after %d:%d iterations: %g ; expected: %g",
                  lb_iter, comp_iter, real_load, expected_load);
@@ -94,11 +96,12 @@ process::~process()
 
 int process::run()
 {
-    XBT_INFO("Initial load: %g", real_load);
+    if (opt::log_rate >= 0)
+        XBT_INFO("Initial load: %g", real_load);
     XBT_VERB("Starting...");
-    compute_thread->start();
-    load_balance_loop();
-    compute_thread->wait();
+    lb_thread->start();
+    compute_loop();
+    lb_thread->wait();
     XBT_VERB("Done.");
     return 0;
 }
@@ -129,6 +132,7 @@ void process::load_balance_loop()
         // send
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
+        prev_load_broadcast = get_load();
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         ctrl_receive(0.0);
@@ -185,6 +189,11 @@ void process::compute_loop()
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
+    // last send, for not losing load scheduled to be sent
+    std::for_each(neigh.begin(), neigh.end(),
+                  bind(&process::data_send, this, _1));
+    finalizing = true;
+    total_load_running -= real_load;
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
@@ -228,7 +237,6 @@ bool process::still_running()
                opt::load_ratio_threshold) {
         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!
-        // fixme: should this chunk be moved before call to receive() ?
         XBT_VERB("No more load to balance in system.");
         last_status = false;
     }
@@ -307,6 +315,7 @@ void process::data_send(neighbor& nb)
     } else {
         load_to_send = nb.get_to_send();
         nb.set_to_send(0.0);
+        // do not update real_load here
     }
     if (load_to_send > 0.0)
         comm.data_send(nb.get_data_mbox(),