X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/635d04eb04fd9464021fcb59c4d63a2a329f0415..3a610d4d2775be71fa1297f7f335376b2945984e:/process.cpp?ds=inline diff --git a/process.cpp b/process.cpp index c104ecd..33a993e 100644 --- a/process.cpp +++ b/process.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -127,12 +128,16 @@ void process::load_balance_loop() ++lb_iter; } + if (!opt::bookkeeping) + expected_load = real_load - get_sum_of_to_send(); + // nothing to do with opt::bookkeeping + if (opt::log_rate && lb_iter % opt::log_rate == 0) { XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load); XBT_VERB("... expected load: %g", expected_load); } - if (get_load() > 0.0) + if (expected_load > 0.0) load_balance(); print_loads(true, xbt_log_priority_debug); @@ -140,7 +145,7 @@ void process::load_balance_loop() // send std::for_each(neigh.begin(), neigh.end(), bind(&process::ctrl_send, this, _1)); - prev_load_broadcast = get_load(); + prev_load_broadcast = expected_load; sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration); ctrl_receive(0.0); @@ -252,6 +257,17 @@ bool process::still_running() return last_status; } +double process::get_sum_of_to_send() const +{ + using std::tr1::bind; + using std::tr1::placeholders::_1; + using std::tr1::placeholders::_2; + + return std::accumulate(neigh.begin(), neigh.end(), 0.0, + bind(std::plus(), + _1, bind(&neighbor::get_to_send, _2))); +} + void process::load_balance() { if (lb_iter == 1) // warn only once @@ -260,40 +276,14 @@ void process::load_balance() void process::send(neighbor& nb, double amount) { - set_load(get_load() - amount); + expected_load -= amount; nb.set_to_send(nb.get_to_send() + amount); nb.set_load(nb.get_load() + amount); } -#define print_loads_generic(vec, verbose, logp, cat) \ - if (_XBT_LOG_ISENABLEDV((*cat), logp)) { \ - using std::tr1::bind; \ - using std::tr1::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)); \ - } 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); -} - -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); -} - -#undef print_loads_generic - void process::ctrl_send(neighbor& nb) { - double info_to_send = get_load(); + double info_to_send = expected_load; if (info_to_send != prev_load_broadcast) comm.ctrl_send(nb.get_ctrl_mbox(), new message(message::INFO, info_to_send)); @@ -312,23 +302,31 @@ void process::data_send(neighbor& nb) { double load_to_send; if (opt::bookkeeping) { - if (real_load <= nb.get_debt()) { - load_to_send = real_load; + load_to_send = std::min(real_load, nb.get_debt()); + if (load_to_send >= opt::min_transfer_amount) { nb.set_debt(nb.get_debt() - load_to_send); - real_load = 0.0; - } else { - load_to_send = nb.get_debt(); - nb.set_debt(0.0); real_load -= load_to_send; + } else { + load_to_send = 0.0; } } else { load_to_send = nb.get_to_send(); - nb.set_to_send(0.0); - // do not update real_load here + if (load_to_send >= opt::min_transfer_amount) { + nb.set_to_send(0.0); + real_load -= load_to_send; + } else { + load_to_send = 0.0; + } + } + while (load_to_send > 0.0) { + double amount; + if (opt::max_transfer_amount) + amount = std::min(load_to_send, opt::max_transfer_amount); + else + amount = load_to_send; + comm.data_send(nb.get_data_mbox(), new message(message::LOAD, amount)); + load_to_send -= amount; } - if (load_to_send > 0.0) - comm.data_send(nb.get_data_mbox(), - new message(message::LOAD, load_to_send)); } void process::ctrl_close(neighbor& nb) @@ -370,7 +368,7 @@ void process::handle_message(message* msg, m_host_t from) switch (msg->get_type()) { case message::INFO: { neighbor* n = rev_neigh[from]; - n->set_load(msg->get_amount()); + n->set_load(msg->get_amount() + n->get_to_send()); break; } case message::CREDIT: @@ -395,6 +393,32 @@ void process::handle_message(message* msg, m_host_t from) delete msg; } +#define print_loads_generic(vec, verbose, logp, cat) \ + if (_XBT_LOG_ISENABLEDV((*cat), logp)) { \ + using std::tr1::bind; \ + using std::tr1::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)); \ + } 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); +} + +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); +} + +#undef print_loads_generic + // Local variables: // mode: c++ // End: