Use a lock-free synchronized queue for the message queue.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index c519cd85320ffb7575603f70eb23decf9238dad4..b36b000f385309ee102c283c7139244d4c3e8a26 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <tr1/functional>
+#include <functional>
 #include <iterator>
 #include <numeric>
 #include <stdexcept>
@@ -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)
@@ -58,8 +58,7 @@ process::process(int argc, char* argv[])
     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))
@@ -70,7 +69,7 @@ process::process(int argc, char* argv[])
         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());
@@ -112,8 +111,7 @@ int process::run()
 
 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()) {
@@ -126,6 +124,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,21 +140,21 @@ 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));
+                      std::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__);
     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);
         XBT_DEBUG("waiting for %d CTRL CLOSE", ctrl_close_pending);
@@ -166,22 +165,24 @@ void process::load_balance_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()) {
         // receive
+        mutex.acquire();
         if (real_load > 0.0)
             data_receive(0.0);
         else
             data_receive(opt::min_comp_iter_duration);
-
-        comm.data_flush(false);
+        mutex.release();
 
         // send
+        comm.data_flush(false);
+        mutex.acquire();
         std::for_each(neigh.begin(), neigh.end(),
-                      bind(&process::data_send, this, _1));
+                      std::bind(&process::data_send, this, _1));
+        mutex.release();
 
         if (real_load == 0.0)
             continue;
@@ -202,13 +203,13 @@ void process::compute_loop()
     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));
+                  std::bind(&process::data_send, this, _1));
     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(),
-                  bind(&process::data_close, this, _1));
+                  std::bind(&process::data_close, this, _1));
     while (data_close_pending) {
         comm.data_flush(false);
         XBT_DEBUG("waiting for %d DATA CLOSE", data_close_pending);
@@ -261,13 +262,12 @@ bool process::still_running()
 
 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,
-                           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()
@@ -406,12 +406,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)) {                            \
-        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(),                           \
-                      bind(&neighbor::print, _1, verbose, logp, cat));  \
+                      std::bind(&neighbor::print, _1, verbose, logp, cat)); \
     } else ((void)0)
 
 void process::print_loads(bool verbose,