Protect concurrent access to real_load.

Is it really needed?

diff --git a/BUGS b/BUGS
index 5d493adbba62676426fa8571d67bc87dc0281733..5cc104066a1923c1dfe7597ba2953204e3444a54 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -1,6 +1,3 @@
-Faut-il protéger les accès concurrents à real_load, entre compute_loop
-et load_balance_loop ?
-
 ========================================================================
 Il semblerait qu'il y ait un bug dans SG 3.5, et qu'on ne puisse pas
 utiliser MSG_comm_waitany() pour l'émetteur *et* le récepteur sans

diff --git a/process.cpp b/process.cpp
index bf016ef0078225a27b1dc0c50605d1407282ac2d..3df086b9c611ce6654df3521fabc1f2e2f94c871 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -126,6 +126,7 @@ void process::load_balance_loop()
             ++lb_iter;
         }
 
+        mutex.acquire();
         if (!opt::bookkeeping)
             expected_load = real_load - get_sum_of_to_send();
         // nothing to do with opt::bookkeeping
@@ -134,6 +135,7 @@ 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);
         }
+        mutex.release();
 
         if (expected_load > 0.0)
             load_balance();
@@ -172,16 +174,20 @@ void process::compute_loop()
     double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
     while (still_running()) {
         // receive
+        mutex.acquire();
         if (real_load > 0.0)
             data_receive(0.0);
         else
             data_receive(opt::min_comp_iter_duration);
+        mutex.release();
 
         comm.data_flush(false);
 
         // send
+        mutex.acquire();
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::data_send, this, _1));
+        mutex.release();
 
         if (real_load == 0.0)
             continue;