Remove parameter "next" for constructor of sync_queue<T>::node.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 3df086b9c611ce6654df3521fabc1f2e2f94c871..b36b000f385309ee102c283c7139244d4c3e8a26 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>


@@ -58,8 +58,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))


@@ -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, ", "),
         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());


@@ -112,8 +111,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()) {


@@ -135,7 +133,6 @@ void process::load_balance_loop()
             XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
             XBT_VERB("... expected load: %g", expected_load);
         }
             XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
             XBT_VERB("... expected load: %g", expected_load);
         }

-        mutex.release();

 
         if (expected_load > 0.0)
             load_balance();
 
         if (expected_load > 0.0)
             load_balance();


@@ -143,21 +140,21 @@ 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);
         XBT_DEBUG("waiting for %d CTRL CLOSE", ctrl_close_pending);
     while (ctrl_close_pending) {
         comm.ctrl_flush(false);
         XBT_DEBUG("waiting for %d CTRL CLOSE", ctrl_close_pending);


@@ -168,8 +165,7 @@ 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()) {


@@ -181,12 +177,11 @@ void process::compute_loop()
             data_receive(opt::min_comp_iter_duration);
         mutex.release();
 
             data_receive(opt::min_comp_iter_duration);
         mutex.release();
 

-        comm.data_flush(false);
-

         // send
         // send

+        comm.data_flush(false);

         mutex.acquire();
         std::for_each(neigh.begin(), neigh.end(),
         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)
         mutex.release();
 
         if (real_load == 0.0)


@@ -208,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(),
     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(),
     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);
     while (data_close_pending) {
         comm.data_flush(false);
         XBT_DEBUG("waiting for %d DATA CLOSE", data_close_pending);


@@ -267,13 +262,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()


@@ -412,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)) {                            \
 
 #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,