X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/52cf3df3d9c14e871452621545b4ba7b8259bf0c..0872290a992e2f6db574c18ac36d1987318d477d:/process.cpp diff --git a/process.cpp b/process.cpp index 95ba1f9..34ddbea 100644 --- a/process.cpp +++ b/process.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -11,6 +10,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); #include "misc.h" #include "options.h" +#include "tracing.h" #include "process.h" @@ -20,7 +20,7 @@ double process::total_load_exit = 0.0; process::process(int argc, char* argv[]) { - if (argc < 2 || !(std::istringstream(argv[1]) >> load)) + if (argc < 2 || !(std::istringstream(argv[1]) >> real_load)) throw std::invalid_argument("bad or missing initial load parameter"); neigh.assign(argv + 2, argv + argc); @@ -35,15 +35,17 @@ process::process(int argc, char* argv[]) comp = 0.0; - prev_load_broadcast = -1; // force sending of load on first send() - expected_load = load; - total_load_running += load; - total_load_init += load; + prev_load_broadcast = -1; // force sending of load on first send_all() + expected_load = real_load; + total_load_running += real_load; + total_load_init += real_load; ctrl_close_pending = data_close_pending = neigh.size(); close_received = false; finalizing = false; + comp_iter = lb_iter = 0; + e_xbt_log_priority_t logp = xbt_log_priority_verbose; if (!LOG_ISENABLED(logp)) return; @@ -56,85 +58,94 @@ process::process(int argc, char* argv[]) std::tr1::mem_fn(&neighbor::get_name)); oss << neigh.back().get_name(); } - LOG1(logp, "Got %s.", oss.str().c_str()); + XBT_LOG(logp, "Got %s.", oss.str().c_str()); print_loads(false, logp); } process::~process() { - total_load_exit += load; + 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); } int process::run() { double next_iter_after_date = 0.0; - INFO1("Initial load: %g", load); - VERB0("Starting..."); - comp_iter = lb_iter = 0; + XBT_INFO("Initial load: %g", real_load); + XBT_VERB("Starting..."); while (true) { - if (opt::min_iter_duration) { + if (get_load() > 0.0) { double now = MSG_get_clock(); - if (now < next_iter_after_date){ - double delay = next_iter_after_date - now; - DEBUG1("sleeping for %g s", delay); - MSG_process_sleep(delay); - } - next_iter_after_date = MSG_get_clock() + opt::min_iter_duration; - } + 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; - double ld = lb_load(); - if (ld > 0.0) { ++lb_iter; if (opt::log_rate && lb_iter % opt::log_rate == 0) { if (opt::bookkeeping) - INFO4("(%u:%u) current load: %g ; expected: %g", - lb_iter, comp_iter, load, expected_load); + XBT_INFO("(%u:%u) current load: %g ; expected: %g", + lb_iter, comp_iter, real_load, expected_load); else - INFO2("(%u) current load: %g", - lb_iter, load); + XBT_INFO("(%u) current load: %g", + lb_iter, real_load); } - ld -= load_balance(ld); + load_balance(); print_loads(true, xbt_log_priority_debug); } - lb_load() = ld; // send load information, and load (data) if any - send(); - if (load > 0.0) { + send_all(); + if (real_load > 0.0) { ++comp_iter; compute(); } if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) { - VERB2("Reached lb_maxiter: %d/%d", 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) { - VERB2("Reached comp_maxiter: %d/%d", 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) { - VERB2("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit); + XBT_VERB("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit); break; } // block on receiving unless there is something to compute or // to send - bool wait = (load == 0 && lb_load() == prev_load_broadcast); - receive(wait); + 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; + else + timeout = 1.0; + receive(timeout); // one of our neighbor is finalizing if (opt::exit_on_close && close_received) { - VERB0("Close received"); + XBT_VERB("Close received"); break; } // have no load and cannot receive anything - if (load == 0.0 && !may_receive()) { - VERB0("I'm a poor lonesome process, and I have no load..."); + if (real_load == 0.0 && !may_receive()) { + XBT_VERB("I'm a poor lonesome process, and I have no load..."); break; } @@ -143,11 +154,13 @@ int process::run() // fixme: should this chunk be moved before call to receive() ? if (100.0 * total_load_running / total_load_init <= opt::load_ratio_threshold) { - VERB0("No more load to balance in system."); + XBT_VERB("No more load to balance in system."); break; + } else { + XBT_DEBUG("still %g load to balance, continuing...", total_load_running); } } - VERB0("Going to finalize..."); + XBT_VERB("Going to finalize..."); finalize(); /* Open Questions : @@ -156,56 +169,42 @@ int process::run() * - how to manage link failures ? */ - VERB0("Done."); - if (opt::bookkeeping) { - INFO4("Final load after %d:%d iterations: %g ; expected: %g", - lb_iter, comp_iter, load, expected_load); - } else { - INFO2("Final load after %d iterations: %g", - lb_iter, load); - if (lb_iter != comp_iter) - WARN2("lb_iter (%d) and comp_iter (%d) differ!", - lb_iter, comp_iter); - } + XBT_VERB("Done."); return 0; } -double process::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))); -} - -double process::load_balance(double /*my_load*/) +void process::load_balance() { if (lb_iter == 1) // warn only once - WARN0("process::load_balance() is a no-op!"); - return 0.0; + XBT_WARN("process::load_balance() is a no-op!"); } void process::compute() { - if (load > 0.0) { - double flops = opt::comp_cost(load); + if (real_load > 0.0) { + double flops = opt::comp_cost(real_load); m_task_t task = MSG_task_create("computation", flops, 0.0, NULL); - DEBUG2("compute %g flop%s", flops, ESSE(flops)); + 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 { - DEBUG0("nothing to compute !"); + XBT_DEBUG("nothing to compute !"); } } +void process::send(neighbor& nb, double amount) +{ + set_load(get_load() - amount); + nb.set_to_send(nb.get_to_send() + amount); + nb.set_load(nb.get_load() + amount); // fixme: make this optional? +} + void process::send1_no_bookkeeping(neighbor& nb) { - if (load != prev_load_broadcast) - comm.send(nb.get_ctrl_mbox(), new message(message::INFO, load)); + if (real_load != prev_load_broadcast) + comm.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.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send)); @@ -229,20 +228,20 @@ void process::send1_bookkeeping(neighbor& nb) } else { new_debt = nb.get_debt(); } - if (load <= new_debt) { - load_to_send = load; + if (real_load <= new_debt) { + load_to_send = real_load; nb.set_debt(new_debt - load_to_send); - load = 0.0; + real_load = 0.0; } else { load_to_send = new_debt; nb.set_debt(0.0); - load -= load_to_send; + real_load -= load_to_send; } if (load_to_send > 0.0) comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send)); } -void process::send() +void process::send_all() { using std::tr1::bind; using std::tr1::placeholders::_1; @@ -254,17 +253,18 @@ void process::send() } else { std::for_each(neigh.begin(), neigh.end(), bind(&process::send1_no_bookkeeping, this, _1)); - prev_load_broadcast = load; + prev_load_broadcast = real_load; } comm.flush(false); } -void process::receive(bool wait) +void process::receive(double timeout) { message* msg; m_host_t from; - while (may_receive() && comm.recv(msg, from, wait)) { + XBT_DEBUG("%sblocking receive (%g)", "\0non-" + !timeout, timeout); + while (may_receive() && comm.recv(msg, from, timeout)) { switch (msg->get_type()) { case message::INFO: { neighbor* n = rev_neigh[from]; @@ -276,7 +276,7 @@ void process::receive(bool wait) break; case message::LOAD: { double ld = msg->get_amount(); - load += ld; + real_load += ld; if (finalizing) total_load_running -= ld; break; @@ -291,7 +291,7 @@ void process::receive(bool wait) break; } delete msg; - wait = false; // only wait on first recv + timeout = 0.0; // only wait on first recv } comm.flush(false); } @@ -308,18 +308,17 @@ void process::finalize() using std::tr1::placeholders::_1; finalizing = true; - total_load_running -= load; + total_load_running -= real_load; - DEBUG2("send CLOSE to %lu neighbor%s", - (unsigned long )neigh.size(), ESSE(neigh.size())); + 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)); - DEBUG2("wait for CLOSE from %lu neighbor%s", - (unsigned long )neigh.size(), ESSE(neigh.size())); while (may_receive()) { comm.flush(false); - receive(true); + XBT_DEBUG("waiting for %d CTRL and %d DATA CLOSE", + ctrl_close_pending, data_close_pending); + receive(-1.0); } comm.flush(true); @@ -329,7 +328,7 @@ void process::finalize() if (_XBT_LOG_ISENABLEDV((*cat), logp)) { \ using std::tr1::bind; \ using std::tr1::placeholders::_1; \ - XCLOG0(cat, logp, "Neighbor loads:"); \ + XBT_XCLOG(cat, logp, "Neighbor loads:"); \ std::for_each(vec.begin(), vec.end(), \ bind(&neighbor::print, _1, verbose, logp, cat)); \ } else ((void)0)