Fix valgrind_suppressions.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 3df086b9c611ce6654df3521fabc1f2e2f94c871..54fea8aeb2ed8534d4561715b9595b0950c967ef 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -135,7 +135,6 @@ void process::load_balance_loop()
             XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
             XBT_VERB("... expected load: %g", expected_load);
         }
             XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
             XBT_VERB("... expected load: %g", expected_load);
         }

-        mutex.release();

 
         if (expected_load > 0.0)
             load_balance();
 
         if (expected_load > 0.0)
             load_balance();


@@ -143,14 +142,14 @@ void process::load_balance_loop()
         print_loads(true, xbt_log_priority_debug);
 
         // send
         print_loads(true, xbt_log_priority_debug);
 
         // send

+        comm.ctrl_flush(false);

         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
         prev_load_broadcast = expected_load;
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
         prev_load_broadcast = expected_load;

+        mutex.release();

 
         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);

-
-        comm.ctrl_flush(false);

     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);


@@ -181,9 +180,8 @@ void process::compute_loop()
             data_receive(opt::min_comp_iter_duration);
         mutex.release();
 
             data_receive(opt::min_comp_iter_duration);
         mutex.release();
 

-        comm.data_flush(false);
-

         // send
         // send

+        comm.data_flush(false);

         mutex.acquire();
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::data_send, this, _1));
         mutex.acquire();
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::data_send, this, _1));