#include <algorithm>
-#include <tr1/functional>
+#include <functional>
#include <iterator>
#include <numeric>
#include <stdexcept>
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;
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))
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());
{
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",
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()) {
++lb_iter;
}
+ ctrl_receive(0.0);
+
mutex.acquire();
if (!opt::bookkeeping)
expected_load = real_load - get_sum_of_to_send();
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();
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);
+ XBT_DEBUG("waiting for %d CTRL_CLOSE", ctrl_close_pending);
ctrl_receive(-1.0);
}
comm.ctrl_flush(true);
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);
- mutex.release();
-
- comm.data_flush(false);
+ // 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);
mutex.acquire();
+ real_load += received_load;
+ received_load = 0.0;
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)
}
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;
- 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);
+ XBT_DEBUG("waiting for %d DATA_CLOSE", data_close_pending);
data_receive(-1.0);
}
+ real_load += received_load;
+ received_load = 0.0;
+ total_load_running -= real_load;
comm.data_flush(true);
}
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()
void process::ctrl_send(neighbor& nb)
{
double info_to_send = expected_load;
- if (info_to_send != prev_load_broadcast) {
- message* msg = new message(message::INFO, info_to_send);
- add_ctrl_send_mesg(msg->get_size());
- comm.ctrl_send(nb.get_ctrl_mbox(), msg);
- }
- 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);
- message* msg = new message(message::CREDIT, debt_to_send);
- add_ctrl_send_mesg(msg->get_size());
- comm.ctrl_send(nb.get_ctrl_mbox(), msg);
}
+ } 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);
}
}
amount = std::min(load_to_send, opt::max_transfer_amount);
else
amount = load_to_send;
- message* msg = 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;
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());
+ expected_load += msg->get_credit(); // may be 0.0 if !opt::bookkeeping
break;
}
- case message::CREDIT:
- expected_load += msg->get_amount();
- break;
- case message::LOAD: {
+ case message::DATA: {
double ld = msg->get_amount();
- real_load += ld;
- if (finalizing)
- total_load_running -= ld;
+ received_load += ld;
break;
}
case message::CTRL_CLOSE:
#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,
