X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/271654d06dedba35eab7c26069a42bac89b0cee4..124a609e80fa7bb5b7a7a698df9c6abef910d83e:/process.cpp diff --git a/process.cpp b/process.cpp index 39646cd..11129e4 100644 --- a/process.cpp +++ b/process.cpp @@ -1,6 +1,7 @@ #include -#include +#include #include +#include #include #include #include @@ -18,6 +19,18 @@ double process::total_load_init = 0.0; double process::total_load_running = 0.0; double process::total_load_exit = 0.0; +namespace { + + void sleep_until_date(double& date, double duration) + { + double sleep_duration = date - MSG_get_clock(); + if (sleep_duration > 0.0) + MSG_process_sleep(sleep_duration); + date = MSG_get_clock() + duration; + } + +} + process::process(int argc, char* argv[]) { if (argc < 2 || !(std::istringstream(argv[1]) >> real_load)) @@ -33,8 +46,6 @@ process::process(int argc, char* argv[]) rev_neigh.insert(std::make_pair(host, ptr)); } - comp = 0.0; - prev_load_broadcast = -1; // force sending of load on first send_all() expected_load = real_load; total_load_running += real_load; @@ -46,6 +57,9 @@ process::process(int argc, char* argv[]) comp_iter = lb_iter = 0; + lb_thread = new_msg_thread("loba", + std::bind(&process::load_balance_loop, this)); + e_xbt_log_priority_t logp = xbt_log_priority_verbose; if (!LOG_ISENABLED(logp)) return; @@ -55,7 +69,7 @@ process::process(int argc, char* argv[]) oss << ESSE(neigh.size()) << ": "; std::transform(neigh.begin(), neigh.end() - 1, std::ostream_iterator(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()); @@ -64,113 +78,196 @@ process::process(int argc, char* argv[]) process::~process() { + delete lb_thread; total_load_exit += real_load; - if (opt::bookkeeping) { - XBT_INFO("Final load after %d:%d iterations: %g ; expected: %g", - lb_iter, comp_iter, real_load, expected_load); - } else { - XBT_INFO("Final load after %d iterations: %g", - lb_iter, real_load); - if (lb_iter != comp_iter) - XBT_WARN("lb_iter (%d) and comp_iter (%d) differ!", - lb_iter, comp_iter); - } - XBT_VERB("Total computation for this process: %g", comp); + if (opt::log_rate < 0) + return; + XBT_INFO("Final load after %d:%d iterations: %g", + lb_iter, comp_iter, real_load); + XBT_VERB("Expected load was: %g", expected_load); + XBT_VERB("Total computation for this process: %g", get_comp_amount()); } int process::run() { - double next_iter_after_date = 0.0; - XBT_INFO("Initial load: %g", real_load); + if (opt::log_rate >= 0) { + XBT_INFO("Initial load: %g", real_load); + XBT_VERB("Initial expected load: %g", expected_load); + } XBT_VERB("Starting..."); - while (true) { - if (get_load() > 0.0) { - double now = MSG_get_clock(); - if (now < next_iter_after_date) - MSG_process_sleep(next_iter_after_date - now); - next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration; + mutex.acquire(); + lb_thread->start(); + while (lb_iter <= opt::comp_iter_delay) + cond.wait(mutex); + mutex.release(); + double sleep_duration = opt::comp_time_delay - MSG_get_clock(); + if (sleep_duration > 0.0) + MSG_process_sleep(sleep_duration); + compute_loop(); + lb_thread->wait(); + XBT_VERB("Done."); + return 0; +} + +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) { + mutex.acquire(); + ++lb_iter; + cond.signal(); + mutex.release(); + } else { ++lb_iter; + } - if (opt::log_rate && lb_iter % opt::log_rate == 0) { - if (opt::bookkeeping) - XBT_INFO("(%u:%u) current load: %g ; expected: %g", - lb_iter, comp_iter, real_load, expected_load); - else - XBT_INFO("(%u) current load: %g", - lb_iter, real_load); - } + mutex.acquire(); + 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 (expected_load > 0.0) load_balance(); - print_loads(true, xbt_log_priority_debug); - } + print_loads(true, xbt_log_priority_debug); - // send load information, and load (data) if any - send_all(); - if (real_load > 0.0) { - ++comp_iter; - compute(); - } + // send + comm.ctrl_flush(false); + std::for_each(neigh.begin(), neigh.end(), + std::bind(&process::ctrl_send, this, _1)); + prev_load_broadcast = expected_load; + mutex.release(); - if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) { - XBT_VERB("Reached lb_maxiter: %d/%d", lb_iter, opt::lb_maxiter); - break; - } - if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) { - XBT_VERB("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter); - break; - } - if (opt::time_limit && MSG_get_clock() >= opt::time_limit) { - XBT_VERB("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit); - break; - } + sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration); + ctrl_receive(0.0); + } + + 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)); + while (ctrl_close_pending) { + comm.ctrl_flush(false); + XBT_DEBUG("waiting for %d CTRL CLOSE", ctrl_close_pending); + ctrl_receive(-1.0); + } + comm.ctrl_flush(true); +} - // block on receiving unless there is something to compute or - // to send - double timeout; - if (real_load != 0 || get_load() != prev_load_broadcast) - timeout = 0.0; - else if (opt::min_lb_iter_duration) - timeout = opt::min_lb_iter_duration; +void process::compute_loop() +{ + 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 - timeout = 1.0; - receive(timeout); + data_receive(opt::min_comp_iter_duration); + mutex.release(); - // one of our neighbor is finalizing - if (opt::exit_on_close && close_received) { - XBT_VERB("Close received"); - break; - } + // send + comm.data_flush(false); + mutex.acquire(); + std::for_each(neigh.begin(), neigh.end(), + std::bind(&process::data_send, this, _1)); + mutex.release(); - // have no load and cannot receive anything - if (real_load == 0.0 && !may_receive()) { - XBT_VERB("I'm a poor lonesome process, and I have no load..."); - break; - } + if (real_load == 0.0) + continue; + + // compute + ++comp_iter; + double flops = opt::comp_cost(real_load); + m_task_t task = MSG_task_create("computation", flops, 0.0, NULL); + TRACE_msg_set_task_category(task, TRACE_CAT_COMP); + XBT_DEBUG("compute %g flop%s", flops, ESSE(flops)); + MSG_task_execute(task); + add_comp_amount(flops); + MSG_task_destroy(task); + + sleep_until_date(next_iter_after_date, opt::min_comp_iter_duration); + } + + 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(), + 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(), + 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); + data_receive(-1.0); + } + comm.data_flush(true); +} + +bool process::still_running() +{ + static bool last_status = true; + + if (!last_status) { + /* nop */ + + } else if (opt::exit_request) { + XBT_VERB("Global exit requested"); + last_status = false; + } else if (opt::time_limit && MSG_get_clock() >= opt::time_limit) { + XBT_VERB("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit); + last_status = false; + + } else if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) { + XBT_VERB("Reached lb_maxiter: %d/%d", lb_iter, opt::lb_maxiter); + last_status = false; + + } else if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) { + XBT_VERB("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter); + last_status = false; + + } else if (opt::exit_on_close && close_received) { + XBT_VERB("Close received"); + last_status = false; + + } else if (real_load == 0.0 && !data_close_pending) { + XBT_VERB("I'm a poor lonesome process, and I have no load..."); + last_status = false; + + } else if (100.0 * total_load_running / total_load_init <= + opt::load_ratio_threshold) { // fixme: this check should be implemented with a distributed // algorithm, and not a shared global variable! - // fixme: should this chunk be moved before call to receive() ? - if (100.0 * total_load_running / total_load_init <= - opt::load_ratio_threshold) { - XBT_VERB("No more load to balance in system."); - break; - } else { - XBT_DEBUG("still %g load to balance, continuing...", total_load_running); - } + XBT_VERB("No more load to balance in system."); + last_status = false; } - XBT_VERB("Going to finalize..."); - finalize(); - /* Open Questions : - * - definition of load on heterogeneous hosts ? - * - how to detect convergence ? - * - how to manage link failures ? - */ + return last_status; +} + +double process::get_sum_of_to_send() const +{ + using std::placeholders::_1; + using std::placeholders::_2; - XBT_VERB("Done."); - return 0; + return std::accumulate(neigh.begin(), neigh.end(), 0.0, + std::bind(std::plus(), _1, + std::bind(&neighbor::get_to_send, _2))); } void process::load_balance() @@ -179,166 +276,139 @@ void process::load_balance() XBT_WARN("process::load_balance() is a no-op!"); } -void process::compute() -{ - if (real_load > 0.0) { - double flops = opt::comp_cost(real_load); - m_task_t task = MSG_task_create("computation", flops, 0.0, NULL); - TRACE_msg_set_task_category(task, TRACE_CAT_COMP); - XBT_DEBUG("compute %g flop%s", flops, ESSE(flops)); - MSG_task_execute(task); - comp += flops; - MSG_task_destroy(task); - } else { - XBT_DEBUG("nothing to compute !"); - } -} - 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); // fixme: make this optional? + nb.set_load(nb.get_load() + amount); } -void process::send1_no_bookkeeping(neighbor& nb) +void process::ctrl_send(neighbor& nb) { - if (real_load != prev_load_broadcast) - comm.ctrl_send(nb.get_ctrl_mbox(), - new message(message::INFO, real_load)); - double load_to_send = nb.get_to_send(); - if (load_to_send > 0.0) { - comm.data_send(nb.get_data_mbox(), - new message(message::LOAD, load_to_send)); - nb.set_to_send(0.0); + double info_to_send = expected_load; + 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); + } + } 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); } } -void process::send1_bookkeeping(neighbor& nb) +void process::data_send(neighbor& nb) { - if (expected_load != prev_load_broadcast) - comm.ctrl_send(nb.get_ctrl_mbox(), - new message(message::INFO, expected_load)); double load_to_send; - double new_debt; - double debt_to_send = nb.get_to_send(); - if (debt_to_send > 0.0) { - comm.ctrl_send(nb.get_ctrl_mbox(), - new message(message::CREDIT, debt_to_send)); - nb.set_to_send(0.0); - new_debt = nb.get_debt() + debt_to_send; + if (opt::bookkeeping) { + 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 -= load_to_send; + } else { + load_to_send = 0.0; + } } else { - new_debt = nb.get_debt(); + load_to_send = nb.get_to_send(); + 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; + } } - if (real_load <= new_debt) { - load_to_send = real_load; - nb.set_debt(new_debt - load_to_send); - real_load = 0.0; - } else { - load_to_send = new_debt; - nb.set_debt(0.0); - real_load -= load_to_send; + 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; + 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; } - if (load_to_send > 0.0) - comm.data_send(nb.get_data_mbox(), - new message(message::LOAD, load_to_send)); } -void process::send_all() +void process::ctrl_close(neighbor& nb) { - using std::tr1::bind; - using std::tr1::placeholders::_1; + comm.ctrl_send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0)); +} - if (opt::bookkeeping) { - std::for_each(neigh.begin(), neigh.end(), - bind(&process::send1_bookkeeping, this, _1)); - prev_load_broadcast = expected_load; - } else { - std::for_each(neigh.begin(), neigh.end(), - bind(&process::send1_no_bookkeeping, this, _1)); - prev_load_broadcast = real_load; - } - comm.ctrl_flush(false); - comm.data_flush(false); +void process::data_close(neighbor& nb) +{ + comm.data_send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0)); } -void process::receive(double timeout) +void process::ctrl_receive(double timeout) { message* msg; m_host_t from; - XBT_DEBUG("%sblocking receive (%g)", "\0non-" + !timeout, timeout); - while (may_receive() && (comm.ctrl_recv(msg, from, timeout) || - comm.data_recv(msg, from, timeout))) { - switch (msg->get_type()) { - case message::INFO: { - neighbor* n = rev_neigh[from]; - n->set_load(msg->get_amount()); - break; - } - case message::CREDIT: - expected_load += msg->get_amount(); - break; - case message::LOAD: { - double ld = msg->get_amount(); - real_load += ld; - if (finalizing) - total_load_running -= ld; - break; - } - case message::CTRL_CLOSE: - ctrl_close_pending--; - close_received = true; - break; - case message::DATA_CLOSE: - data_close_pending--; - close_received = true; - break; - } - delete msg; - timeout = 0.0; // only wait on first recv + 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) + add_ctrl_recv_mesg(msg->get_size()); + handle_message(msg, from); + timeout = 0.0; } - comm.ctrl_flush(false); - comm.data_flush(false); } -void process::finalize1(neighbor& nb) +void process::data_receive(double timeout) { - comm.ctrl_send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0)); - comm.data_send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0)); + message* msg; + m_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) + add_data_recv_mesg(msg->get_size()); + handle_message(msg, from); + timeout = 0.0; + } } -void process::finalize() +void process::handle_message(message* msg, m_host_t from) { - using std::tr1::bind; - using std::tr1::placeholders::_1; - - finalizing = true; - total_load_running -= real_load; - - XBT_DEBUG("send CLOSE to %zu neighbor%s", neigh.size(), ESSE(neigh.size())); - std::for_each(neigh.begin(), neigh.end(), - bind(&process::finalize1, this, _1)); - - while (may_receive()) { - comm.ctrl_flush(false); - comm.data_flush(false); - XBT_DEBUG("waiting for %d CTRL and %d DATA CLOSE", - ctrl_close_pending, data_close_pending); - receive(-1.0); + switch (msg->get_type()) { + 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; } - - comm.ctrl_flush(true); - comm.data_flush(true); + case message::DATA: { + double ld = msg->get_amount(); + real_load += ld; + if (finalizing) + total_load_running -= ld; + break; + } + case message::CTRL_CLOSE: + ctrl_close_pending--; + close_received = true; + break; + case message::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::tr1::bind; \ - using std::tr1::placeholders::_1; \ - XBT_XCLOG(cat, logp, "Neighbor loads:"); \ + 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,