Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 33a993ef5eb8e96041302b563acef1fafeb557b7..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)
@@ -46,8 +46,6 @@ process::process(int argc, char* argv[])
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 
-    comp = 0.0;
-
     prev_load_broadcast = -1;   // force sending of load on first send_all()
     expected_load = real_load;
     total_load_running += real_load;
@@ -88,7 +86,7 @@ process::~process()
     XBT_INFO("Final load after %d:%d iterations: %g",
              lb_iter, comp_iter, real_load);
     XBT_VERB("Expected load was: %g", expected_load);
-    XBT_VERB("Total computation for this process: %g", comp);
+    XBT_VERB("Total computation for this process: %g", get_comp_amount());
 }
 
 int process::run()
@@ -128,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
@@ -143,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__);
@@ -174,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);
@@ -195,7 +197,7 @@ void process::compute_loop()
         TRACE_msg_set_task_category(task, TRACE_CAT_COMP);
         XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
-        comp += flops;
+        add_comp_amount(flops);
         MSG_task_destroy(task);
 
         sleep_until_date(next_iter_after_date, opt::min_comp_iter_duration);
@@ -226,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;
@@ -284,16 +290,19 @@ void process::send(neighbor& nb, double amount)
 void process::ctrl_send(neighbor& nb)
 {
     double info_to_send = expected_load;
-    if (info_to_send != prev_load_broadcast)
-        comm.ctrl_send(nb.get_ctrl_mbox(),
-                       new message(message::INFO, info_to_send));
+    if (info_to_send != prev_load_broadcast) {
+        message* msg = new message(message::INFO, info_to_send);
+        add_ctrl_send_mesg(msg->get_size());
+        comm.ctrl_send(nb.get_ctrl_mbox(), msg);
+    }
     if (opt::bookkeeping) {
         double debt_to_send = nb.get_to_send();
         if (debt_to_send > 0.0) {
             nb.set_to_send(0.0);
             nb.set_debt(nb.get_debt() + debt_to_send);
-            comm.ctrl_send(nb.get_ctrl_mbox(),
-                           new message(message::CREDIT, debt_to_send));
+            message* msg = new message(message::CREDIT, debt_to_send);
+            add_ctrl_send_mesg(msg->get_size());
+            comm.ctrl_send(nb.get_ctrl_mbox(), msg);
         }
     }
 }
@@ -324,7 +333,9 @@ void process::data_send(neighbor& nb)
             amount = std::min(load_to_send, opt::max_transfer_amount);
         else
             amount = load_to_send;
-        comm.data_send(nb.get_data_mbox(), new message(message::LOAD, amount));
+        message* msg = new message(message::LOAD, amount);
+        add_data_send_mesg(msg->get_size());
+        comm.data_send(nb.get_data_mbox(), msg);
         load_to_send -= amount;
     }
 }
@@ -346,6 +357,8 @@ void process::ctrl_receive(double timeout)
 
     XBT_DEBUG("%sblocking receive on ctrl (%g)", "\0non-" + !timeout, timeout);
     while (ctrl_close_pending && comm.ctrl_recv(msg, from, timeout)) {
+        if (msg->get_type() != message::CTRL_CLOSE)
+            add_ctrl_recv_mesg(msg->get_size());
         handle_message(msg, from);
         timeout = 0.0;
     }
@@ -358,6 +371,8 @@ void process::data_receive(double timeout)
 
     XBT_DEBUG("%sblocking receive on data (%g)", "\0non-" + !timeout, timeout);
     while (data_close_pending && comm.data_recv(msg, from, timeout)) {
+        if (msg->get_type() != message::DATA_CLOSE)
+            add_data_recv_mesg(msg->get_size());
         handle_message(msg, from);
         timeout = 0.0;
     }