Check for real_load being null *after* sending loop.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index d0bfc21120b8cbc8ea0230b4eb9bb97e4eeb26f3..c519cd85320ffb7575603f70eb23decf9238dad4 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -179,13 +179,13 @@ void process::compute_loop()
 
         comm.data_flush(false);
 
 
         comm.data_flush(false);
 

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

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

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

         // compute
         ++comp_iter;
         double flops = opt::comp_cost(real_load);
         // compute
         ++comp_iter;
         double flops = opt::comp_cost(real_load);


@@ -224,6 +224,10 @@ bool process::still_running()
     if (!last_status) {
         /* nop */
 
     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;
     } 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;