Quit immediately on 2nd Ctrl-C.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index d0bfc21120b8cbc8ea0230b4eb9bb97e4eeb26f3..54fea8aeb2ed8534d4561715b9595b0950c967ef 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -21,7 +21,7 @@ double process::total_load_exit = 0.0;
 
 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)
@@ -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
@@ -141,14 +142,14 @@ void process::load_balance_loop()
         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;
+        mutex.release();
 
         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__);
@@ -172,20 +173,23 @@ 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();
 
+        // send
         comm.data_flush(false);
+        mutex.acquire();
+        std::for_each(neigh.begin(), neigh.end(),
+                      bind(&process::data_send, this, _1));
+        mutex.release();
 
         if (real_load == 0.0)
             continue;
 
-        // send
-        std::for_each(neigh.begin(), neigh.end(),
-                      bind(&process::data_send, this, _1));
-
         // compute
         ++comp_iter;
         double flops = opt::comp_cost(real_load);
@@ -224,6 +228,10 @@ bool process::still_running()
     if (!last_status) {
         /* nop */
 
+    } else if (opt::exit_request) {
+        XBT_VERB("Global exit requested");
+        last_status = false;
+
     } else if (opt::time_limit && MSG_get_clock() >= opt::time_limit) {
         XBT_VERB("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit);
         last_status = false;