X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/e02d85948b5f10d8b37e39ec94d915c48f46a15a..4b1551933104a6764eec30774b92737cda2d8097:/process.cpp?ds=sidebyside diff --git a/process.cpp b/process.cpp index 1556f3c..a24d6eb 100644 --- a/process.cpp +++ b/process.cpp @@ -1,5 +1,3 @@ -#include "process.h" - #include #include #include @@ -8,10 +6,13 @@ #include #include #include + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); + #include "misc.h" #include "options.h" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); +#include "process.h" double process::total_load_init = 0.0; double process::total_load_exit = 0.0; @@ -31,6 +32,7 @@ process::process(int argc, char* argv[]) rev_neigh.insert(std::make_pair(host, ptr)); } + prev_load_broadcast = -1; // force sending of load on first send() expected_load = load; total_load_init += load; @@ -39,7 +41,10 @@ process::process(int argc, char* argv[]) comm.next_close_on_ctrl_is_last(); comm.next_close_on_data_is_last(); } - if (neigh.size() > 0) + close_received = false; + may_receive = (neigh.size() > 0); // the same as (ctrl_close_pending || + // data_close_pending) + if (may_receive) comm.listen(); e_xbt_log_priority_t logp = xbt_log_priority_verbose; @@ -55,7 +60,7 @@ process::process(int argc, char* argv[]) oss << neigh.back().get_name(); } LOG1(logp, "Got %s.", oss.str().c_str()); - print_loads(logp); + print_loads(true, logp); } process::~process() @@ -67,8 +72,6 @@ int process::run() { INFO1("Initial load: %g", load); VERB0("Starting..."); - // first send() to inform neighbors about our load (force it) - prev_load_broadcast = -1; iter = 0; bool one_more = true; do { @@ -82,7 +85,7 @@ int process::run() INFO2("(%u) current load: %g", iter, load); } - print_loads(xbt_log_priority_debug); + print_loads(true, xbt_log_priority_debug); if (opt::bookkeeping) expected_load -= load_balance(expected_load); @@ -94,24 +97,25 @@ int process::run() // NDS for Need To Send #define NDS ((opt::bookkeeping ? expected_load : load) != prev_load_broadcast) - bool can_recv; do { - // General idea: do not iterate if there is nothing to - // compute, nor to send. + // General idea: block on receiving unless there is + // something to compute, or to send, or we must exit. // fixme: review this chunk, and remove this NDS macro! + // FIXME: HAD A DEADLOCK HERE... + bool recv_wait = (load == 0 && !NDS); - bool close_received = !receive(recv_wait? WAIT: NO_WAIT); + DEBUG1("CALL RECEIVE(%s)", recv_wait? "WAIT": "NO_WAIT"); + receive(recv_wait? WAIT: NO_WAIT); if (opt::exit_on_close && close_received) one_more = false; else if (opt::maxiter && iter >= opt::maxiter) one_more = false; - can_recv = (ctrl_close_pending || data_close_pending); - - } while (one_more && can_recv && load == 0 && !NDS); + } while (one_more && may_receive && load == 0 && !NDS); + DEBUG0("RECEIVE LOOP ENDED"); #undef NDS } while (one_more); @@ -217,15 +221,14 @@ void process::send() } } -bool process::receive(recv_wait_mode wait) +void process::receive(recv_wait_mode wait) { // DEBUG1("go for receive(%s)", // "NO_WAIT\0WAIT\0\0\0\0WAIT_FOR_CLOSE" + 8 * wait); - bool result = true; message* msg; m_host_t from; - bool do_recv = ctrl_close_pending || data_close_pending; - while (do_recv && comm.recv(msg, from, wait)) { + bool do_loop = may_receive; + while (do_loop && comm.recv(msg, from, wait)) { switch (msg->get_type()) { case message::INFO: { neighbor* n = rev_neigh[from]; @@ -241,21 +244,20 @@ bool process::receive(recv_wait_mode wait) case message::CTRL_CLOSE: if (--ctrl_close_pending == 1) comm.next_close_on_ctrl_is_last(); - DEBUG1("ctrl_close_pending = %d", ctrl_close_pending); - result = false; + // DEBUG1("ctrl_close_pending = %d", ctrl_close_pending); + close_received = true; break; case message::DATA_CLOSE: if (--data_close_pending == 1) comm.next_close_on_data_is_last(); - DEBUG1("data_close_pending = %d", data_close_pending); - result = false; + // DEBUG1("data_close_pending = %d", data_close_pending); + close_received = true; break; } delete msg; - do_recv = (wait == WAIT_FOR_CLOSE) && - (ctrl_close_pending || data_close_pending); + may_receive = (ctrl_close_pending || data_close_pending); + do_loop = (wait == WAIT_FOR_CLOSE) && may_receive; } - return result; } void process::finalize1(neighbor& nb) @@ -281,23 +283,31 @@ void process::finalize() comm.flush(true); } -void process::print_loads(e_xbt_log_priority_t logp) +#define print_loads_generic(vec, verbose, logp, cat) \ + if (_XBT_LOG_ISENABLEDV((*cat), logp)) { \ + using namespace std::tr1; \ + using namespace std::tr1::placeholders; \ + XCLOG0(cat, logp, "Neighbor loads:"); \ + 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 { - if (!LOG_ISENABLED(logp)) - return; + print_loads_generic(neigh, verbose, logp, cat); +} - std::ostringstream oss; - if (neigh.empty()) { - oss << "no neighbor!"; - } else { - std::transform(neigh.begin(), neigh.end() - 1, - std::ostream_iterator(oss, ", "), - std::tr1::mem_fn(&neighbor::get_load)); - oss << neigh.back().get_load(); - } - LOG1(logp, "Neighbor loads: %s", oss.str().c_str()); +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: