Spell sig_atomic_t as std::sig_atomic_t.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index c519cd85320ffb7575603f70eb23decf9238dad4..54fea8aeb2ed8534d4561715b9595b0950c967ef 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -21,7 +21,7 @@ double process::total_load_exit = 0.0;
 
 namespace {
 
 
 namespace {
 

-    void sleep_until_date(double& date, double duration = 0.0)
+    void sleep_until_date(double& date, double duration)

     {
         double sleep_duration = date - MSG_get_clock();
         if (sleep_duration > 0.0)
     {
         double sleep_duration = date - MSG_get_clock();
         if (sleep_duration > 0.0)


@@ -126,6 +126,7 @@ void process::load_balance_loop()
             ++lb_iter;
         }
 
             ++lb_iter;
         }
 

+        mutex.acquire();

         if (!opt::bookkeeping)
             expected_load = real_load - get_sum_of_to_send();
         // nothing to do with opt::bookkeeping
         if (!opt::bookkeeping)
             expected_load = real_load - get_sum_of_to_send();
         // nothing to do with opt::bookkeeping


@@ -141,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__);


@@ -172,16 +173,19 @@ void process::compute_loop()
     double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
     while (still_running()) {
         // receive
     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);
         if (real_load > 0.0)
             data_receive(0.0);
         else
             data_receive(opt::min_comp_iter_duration);

-
-        comm.data_flush(false);
+        mutex.release();

 
         // send
 
         // send

+        comm.data_flush(false);
+        mutex.acquire();

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

+        mutex.release();

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