Save notes for pstar.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 6aceea45c0cc9e8cf96ca2993ec04fe2baadc145..811804fa81558253c282b3975751673e4d98f1da 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,12 +1,10 @@
 #include <algorithm>
 #include <cmath>
 #include <algorithm>
 #include <cmath>

-#include <functional>

 #include <iterator>
 #include <numeric>
 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>
 #include <iterator>
 #include <numeric>
 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>

-#include <xbt/time.h>

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 


@@ -91,8 +89,7 @@ process::process(int argc, char* argv[])
 
     all_comp_iter = comp_iter = lb_iter = 0;
 
 
     all_comp_iter = comp_iter = lb_iter = 0;
 

-    lb_thread = new_msg_thread("loba",
-                               std::bind(&process::load_balance_loop, this));
+    lb_thread = new_msg_thread("loba", [this]() { this->load_balance_loop(); });

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


@@ -103,7 +100,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::mem_fn(&neighbor::get_name));
+                       [](const neighbor& neigh) { return neigh.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());


@@ -171,8 +168,6 @@ int process::run()
 
 void process::load_balance_loop()
 {
 
 void process::load_balance_loop()
 {

-    using std::placeholders::_1;
-

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


@@ -204,8 +199,8 @@ void process::load_balance_loop()
 
         // send
         comm.ctrl_flush(false);
 
         // send
         comm.ctrl_flush(false);

-        std::for_each(neigh.begin(), neigh.end(),
-                      std::bind(&process::ctrl_send, this, _1));
+        for (neighbor& n : neigh)
+            ctrl_send(n);

         prev_load_broadcast = expected_load;
         mutex.release();
 
         prev_load_broadcast = expected_load;
         mutex.release();
 


@@ -215,8 +210,8 @@ void process::load_balance_loop()
     XBT_VERB("Going to finalize for %s...", __func__);
     XBT_DEBUG("send CTRL_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     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(),
-                  std::bind(&process::ctrl_close, this, _1));
+    for (neighbor& n : neigh)
+        ctrl_close(n);

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


@@ -227,8 +222,6 @@ void process::load_balance_loop()
 
 void process::compute_loop()
 {
 
 void process::compute_loop()
 {

-    using std::placeholders::_1;
-

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


@@ -242,8 +235,8 @@ void process::compute_loop()
         mutex.acquire();
         real_load += received_load;
         received_load = 0.0;
         mutex.acquire();
         real_load += received_load;
         received_load = 0.0;

-        std::for_each(neigh.begin(), neigh.end(),
-                      std::bind(&process::data_send, this, _1));
+        for (neighbor& n : neigh)
+            data_send(n);

         mutex.release();
 
         ++all_comp_iter;
         mutex.release();
 
         ++all_comp_iter;


@@ -273,8 +266,8 @@ void process::compute_loop()
     finalizing = true;
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     finalizing = true;
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));

-    std::for_each(neigh.begin(), neigh.end(),
-                  std::bind(&process::data_close, this, _1));
+    for (neighbor& n : neigh)
+        data_close(n);

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


@@ -363,12 +356,10 @@ bool process::still_running()
 
 double process::get_sum_of_to_send() const
 {
 
 double process::get_sum_of_to_send() const
 {

-    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,

-                           std::bind(std::plus<double>(), _1,
-                                     std::bind(&neighbor::get_to_send, _2)));
+                           [](double x, const neighbor& neigh) {
+                               return x + neigh.get_to_send();
+                           });

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


@@ -522,27 +513,28 @@ void process::handle_message(message* msg, msg_host_t from)
     delete msg;
 }
 
     delete msg;
 }
 

-#define print_loads_generic(vec, verbose, logp, cat)                    \
-    if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \
-        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(),                           \
-                      std::bind(&neighbor::print, _1, verbose, logp, cat)); \
-    } else ((void)0)
-

 void process::print_loads(bool verbose,
                           e_xbt_log_priority_t logp,
                           xbt_log_category_t cat) const
 {
 void process::print_loads(bool verbose,
                           e_xbt_log_priority_t logp,
                           xbt_log_category_t cat) const
 {

-    print_loads_generic(neigh, verbose, logp, cat);
+    if (!_XBT_LOG_ISENABLEDV((*cat), logp))
+        return;
+    XBT_XCLOG(cat, logp, "My load: %g (real); %g (expected).  Neighbor loads:",
+              real_load, expected_load);
+    for (const neighbor& n : neigh)
+        n.print(verbose, logp, cat);

 }
 
 void process::print_loads_p(bool verbose,
                             e_xbt_log_priority_t logp,
                             xbt_log_category_t cat) const
 {
 }
 
 void process::print_loads_p(bool verbose,
                             e_xbt_log_priority_t logp,
                             xbt_log_category_t cat) const
 {

-    print_loads_generic(pneigh, verbose, logp, cat);
+    if (!_XBT_LOG_ISENABLEDV((*cat), logp))
+        return;
+    XBT_XCLOG(cat, logp, "My load: %g (real); %g (expected).  Neighbor loads:",
+              real_load, expected_load);
+    for (const neighbor* n : pneigh)
+        n->print(verbose, logp, cat);

 }
 
 #undef print_loads_generic
 }
 
 #undef print_loads_generic