Update prev_load_broadcast.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index e5ba3cd0fa596d3cefcd56d9f9ba2e2d40897c02..26e11370216a4de9b928035d467dadae39f7a041 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -82,6 +82,8 @@ process::~process()
 {
     delete compute_thread;
     total_load_exit += real_load;
 {
     delete compute_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);
     if (opt::bookkeeping) {
         XBT_INFO("Final load after %d:%d iterations: %g ; expected: %g",
                  lb_iter, comp_iter, real_load, expected_load);


@@ -94,7 +96,8 @@ process::~process()
 
 int process::run()
 {
 
 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();
     XBT_VERB("Starting...");
     compute_thread->start();
     load_balance_loop();


@@ -129,6 +132,7 @@ void process::load_balance_loop()
         // send
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
         // 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);
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         ctrl_receive(0.0);


@@ -228,7 +232,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!
                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;
     }
         XBT_VERB("No more load to balance in system.");
         last_status = false;
     }