#include <algorithm>
#include <cmath>
-#include <functional>
#include <iterator>
#include <numeric>
#include <stdexcept>
#include <sstream>
#include <xbt/log.h>
-#include <xbt/time.h>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
pneigh.reserve(neigh.size());
for (unsigned i = 0 ; i < neigh.size() ; i++) {
neighbor* ptr = &neigh[i];
- m_host_t host = MSG_get_host_by_name(ptr->get_name());
+ msg_host_t host = MSG_get_host_by_name(ptr->get_name());
pneigh.push_back(ptr);
rev_neigh.insert(std::make_pair(host, ptr));
}
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))
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());
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) {
// 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();
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);
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()) {
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;
idle_duration += MSG_get_clock() - idle_since_date;
++comp_iter;
double flops = opt::comp_cost(real_load);
- m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
+ msg_task_t task = MSG_task_create("computation", flops, 0.0, nullptr);
// MSG_task_set_category(task, TRACE_CAT_COMP);
XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
MSG_task_execute(task);
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);
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,
- 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()
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);
+ message* msg =
+ new message(message::message_type::CTRL, info_to_send, debt_to_send);
add_ctrl_send_mesg(msg->get_size());
comm.ctrl_send(nb.get_ctrl_mbox(), msg);
}
amount = std::min(load_to_send, opt::max_transfer_amount);
else
amount = load_to_send;
- message* msg = new message(message::DATA, amount);
+ message* msg = new message(message::message_type::DATA, amount);
add_data_send_mesg(msg->get_size());
comm.data_send(nb.get_data_mbox(), msg);
load_to_send -= amount;
void process::ctrl_close(neighbor& nb)
{
- comm.ctrl_send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0));
+ comm.ctrl_send(nb.get_ctrl_mbox(),
+ new message(message::message_type::CTRL_CLOSE, 0.0));
}
void process::data_close(neighbor& nb)
{
- comm.data_send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0));
+ comm.data_send(nb.get_data_mbox(),
+ new message(message::message_type::DATA_CLOSE, 0.0));
}
void process::ctrl_receive(double timeout)
{
message* msg;
- m_host_t from;
+ msg_host_t from;
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)
+ if (msg->get_type() != message::message_type::CTRL_CLOSE)
add_ctrl_recv_mesg(msg->get_size());
handle_message(msg, from);
timeout = 0.0;
void process::data_receive(double timeout)
{
message* msg;
- m_host_t from;
+ msg_host_t from;
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)
+ if (msg->get_type() != message::message_type::DATA_CLOSE)
add_data_recv_mesg(msg->get_size());
handle_message(msg, from);
timeout = 0.0;
}
}
-void process::handle_message(message* msg, m_host_t from)
+void process::handle_message(message* msg, msg_host_t from)
{
switch (msg->get_type()) {
- case message::CTRL: {
+ case message::message_type::CTRL: {
neighbor* n = rev_neigh[from];
n->set_load(msg->get_amount() + n->get_to_send());
if (opt::bookkeeping) {
}
break;
}
- case message::DATA: {
+ case message::message_type::DATA: {
neighbor* n = rev_neigh[from];
double ld = msg->get_amount();
received_load += ld;
n->set_credit(n->get_credit() - ld);
break;
}
- case message::CTRL_CLOSE:
+ case message::message_type::CTRL_CLOSE:
ctrl_close_pending--;
close_received = true;
break;
- case message::DATA_CLOSE:
+ case message::message_type::DATA_CLOSE:
data_close_pending--;
close_received = true;
break;
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
{
- 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
{
- 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
