Reverted run-all to original

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 33a993ef5eb8e96041302b563acef1fafeb557b7..2de3016588dd2dd95e66b073eba4b59eb1ab7e18 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
 #include <algorithm>

-#include <tr1/functional>
+#include <functional>

 #include <iterator>
 #include <numeric>
 #include <stdexcept>
 #include <iterator>
 #include <numeric>
 #include <stdexcept>


@@ -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)


@@ -46,12 +46,11 @@ process::process(int argc, char* argv[])
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 
         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;
     total_load_init += real_load;
     prev_load_broadcast = -1;   // force sending of load on first send_all()
     expected_load = real_load;
     total_load_running += real_load;
     total_load_init += real_load;

+    received_load = 0.0;

 
     ctrl_close_pending = data_close_pending = neigh.size();
     close_received = false;
 
     ctrl_close_pending = data_close_pending = neigh.size();
     close_received = false;


@@ -60,8 +59,7 @@ process::process(int argc, char* argv[])
     comp_iter = lb_iter = 0;
 
     lb_thread = new_msg_thread("loba",
     comp_iter = lb_iter = 0;
 
     lb_thread = new_msg_thread("loba",

-                               std::tr1::bind(&process::load_balance_loop,
-                                              this));
+                               std::bind(&process::load_balance_loop, this));

 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))


@@ -72,7 +70,7 @@ process::process(int argc, char* argv[])
         oss << ESSE(neigh.size()) << ": ";
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),
         oss << ESSE(neigh.size()) << ": ";
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),

-                       std::tr1::mem_fn(&neighbor::get_name));
+                       std::mem_fn(&neighbor::get_name));

         oss << neigh.back().get_name();
     }
     XBT_LOG(logp, "Got %s.", oss.str().c_str());
         oss << neigh.back().get_name();
     }
     XBT_LOG(logp, "Got %s.", oss.str().c_str());


@@ -83,12 +81,14 @@ process::~process()
 {
     delete lb_thread;
     total_load_exit += real_load;
 {
     delete lb_thread;
     total_load_exit += real_load;

+    xbt_assert(received_load == 0.0,
+               "received_load is %g, but should be 0.0 !", received_load);

     if (opt::log_rate < 0)
         return;
     XBT_INFO("Final load after %d:%d iterations: %g",
              lb_iter, comp_iter, real_load);
     XBT_VERB("Expected load was: %g", expected_load);
     if (opt::log_rate < 0)
         return;
     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()
 }
 
 int process::run()


@@ -114,8 +114,7 @@ int process::run()
 
 void process::load_balance_loop()
 {
 
 void process::load_balance_loop()
 {

-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
+    using std::placeholders::_1;

 
     double next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration;
     while (still_running()) {
 
     double next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration;
     while (still_running()) {


@@ -128,6 +127,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


@@ -143,24 +143,24 @@ 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(),
         std::for_each(neigh.begin(), neigh.end(),

-                      bind(&process::ctrl_send, this, _1));
+                      std::bind(&process::ctrl_send, this, _1));

         prev_load_broadcast = expected_load;
         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_DEBUG("send CTRL_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
     XBT_DEBUG("send CTRL_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),

-                  bind(&process::ctrl_close, this, _1));
+                  std::bind(&process::ctrl_close, this, _1));

     while (ctrl_close_pending) {
         comm.ctrl_flush(false);
     while (ctrl_close_pending) {
         comm.ctrl_flush(false);

-        XBT_DEBUG("waiting for %d CTRL CLOSE", ctrl_close_pending);
+        XBT_DEBUG("waiting for %d CTRL_CLOSE", ctrl_close_pending);

         ctrl_receive(-1.0);
     }
     comm.ctrl_flush(true);
         ctrl_receive(-1.0);
     }
     comm.ctrl_flush(true);


@@ -168,26 +168,25 @@ void process::load_balance_loop()
 
 void process::compute_loop()
 {
 
 void process::compute_loop()
 {

-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
+    using std::placeholders::_1;

 
     double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
     while (still_running()) {
 
     double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
     while (still_running()) {

-        // receive
-        if (real_load > 0.0)
-            data_receive(0.0);
-        else
-            data_receive(opt::min_comp_iter_duration);
+        // receive (do not block if there is something to compute)
+        data_receive(real_load > 0.0 ? 0.0 : opt::min_comp_iter_duration);

 
 

+        // send

         comm.data_flush(false);
         comm.data_flush(false);

+        mutex.acquire();
+        real_load += received_load;
+        received_load = 0.0;
+        std::for_each(neigh.begin(), neigh.end(),
+                      std::bind(&process::data_send, this, _1));
+        mutex.release();

 
         if (real_load == 0.0)
             continue;
 
 
         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);
         // compute
         ++comp_iter;
         double flops = opt::comp_cost(real_load);


@@ -195,27 +194,26 @@ 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);
         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);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
         MSG_task_destroy(task);
 
         sleep_until_date(next_iter_after_date, opt::min_comp_iter_duration);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);

-    // last send, for not losing load scheduled to be sent
-    std::for_each(neigh.begin(), neigh.end(),
-                  bind(&process::data_send, this, _1));

     finalizing = true;
     finalizing = true;

-    total_load_running -= real_load;

     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),

-                  bind(&process::data_close, this, _1));
+                  std::bind(&process::data_close, this, _1));

     while (data_close_pending) {
         comm.data_flush(false);
     while (data_close_pending) {
         comm.data_flush(false);

-        XBT_DEBUG("waiting for %d DATA CLOSE", data_close_pending);
+        XBT_DEBUG("waiting for %d DATA_CLOSE", data_close_pending);

         data_receive(-1.0);
     }
         data_receive(-1.0);
     }

+    real_load += received_load;
+    received_load = 0.0;
+    total_load_running -= real_load;

     comm.data_flush(true);
 }
 
     comm.data_flush(true);
 }
 


@@ -226,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;


@@ -259,13 +261,12 @@ bool process::still_running()
 
 double process::get_sum_of_to_send() const
 {
 
 double process::get_sum_of_to_send() const
 {

-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
-    using std::tr1::placeholders::_2;
+    using std::placeholders::_1;
+    using std::placeholders::_2;

 
     return std::accumulate(neigh.begin(), neigh.end(), 0.0,
 
     return std::accumulate(neigh.begin(), neigh.end(), 0.0,

-                           bind(std::plus<double>(),
-                                _1, bind(&neighbor::get_to_send, _2)));
+                           std::bind(std::plus<double>(), _1,
+                                     std::bind(&neighbor::get_to_send, _2)));

 }
 
 void process::load_balance()
 }
 
 void process::load_balance()


@@ -284,17 +285,20 @@ void process::send(neighbor& nb, double amount)
 void process::ctrl_send(neighbor& nb)
 {
     double info_to_send = expected_load;
 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 (opt::bookkeeping) {
-        double debt_to_send = nb.get_to_send();
+    double debt_to_send;
+    if (opt::bookkeeping) {     // bookkeeping
+        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);
         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));

         }
         }

+    } else {                    // !bookkeeping
+        debt_to_send = 0.0;
+    }
+    if (info_to_send != prev_load_broadcast || debt_to_send > 0.0) {
+        message* msg = new message(message::CTRL, info_to_send, debt_to_send);
+        add_ctrl_send_mesg(msg->get_size());
+        comm.ctrl_send(nb.get_ctrl_mbox(), msg);

     }
 }
 
     }
 }
 


@@ -324,7 +328,9 @@ void process::data_send(neighbor& nb)
             amount = std::min(load_to_send, opt::max_transfer_amount);
         else
             amount = load_to_send;
             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::DATA, amount);
+        add_data_send_mesg(msg->get_size());
+        comm.data_send(nb.get_data_mbox(), msg);

         load_to_send -= amount;
     }
 }
         load_to_send -= amount;
     }
 }


@@ -346,6 +352,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)) {
 
     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;
     }
         handle_message(msg, from);
         timeout = 0.0;
     }


@@ -358,6 +366,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)) {
 
     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;
     }
         handle_message(msg, from);
         timeout = 0.0;
     }


@@ -366,19 +376,15 @@ void process::data_receive(double timeout)
 void process::handle_message(message* msg, m_host_t from)
 {
     switch (msg->get_type()) {
 void process::handle_message(message* msg, m_host_t from)
 {
     switch (msg->get_type()) {

-    case message::INFO: {
+    case message::CTRL: {

         neighbor* n = rev_neigh[from];
         n->set_load(msg->get_amount() + n->get_to_send());
         neighbor* n = rev_neigh[from];
         n->set_load(msg->get_amount() + n->get_to_send());

+        expected_load += msg->get_credit(); // may be 0.0 if !opt::bookkeeping

         break;
     }
         break;
     }

-    case message::CREDIT:
-        expected_load += msg->get_amount();
-        break;
-    case message::LOAD: {
+    case message::DATA: {

         double ld = msg->get_amount();
         double ld = msg->get_amount();

-        real_load += ld;
-        if (finalizing)
-            total_load_running -= ld;
+        received_load += ld;

         break;
     }
     case message::CTRL_CLOSE:
         break;
     }
     case message::CTRL_CLOSE:


@@ -395,12 +401,11 @@ void process::handle_message(message* msg, m_host_t from)
 
 #define print_loads_generic(vec, verbose, logp, cat)                    \
     if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \
 
 #define print_loads_generic(vec, verbose, logp, cat)                    \
     if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \

-        using std::tr1::bind;                                           \
-        using std::tr1::placeholders::_1;                               \
+        using std::placeholders::_1;                                    \

         XBT_XCLOG(cat, logp, "My load: %g (real); %g (expected).  "     \
                   "Neighbor loads:", real_load, expected_load);         \
         std::for_each(vec.begin(), vec.end(),                           \
         XBT_XCLOG(cat, logp, "My load: %g (real); %g (expected).  "     \
                   "Neighbor loads:", real_load, expected_load);         \
         std::for_each(vec.begin(), vec.end(),                           \

-                      bind(&neighbor::print, _1, verbose, logp, cat));  \
+                      std::bind(&neighbor::print, _1, verbose, logp, cat)); \

     } else ((void)0)
 
 void process::print_loads(bool verbose,
     } else ((void)0)
 
 void process::print_loads(bool verbose,