X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/fc5dcac1115a7112e7ad9d67ce7fe233790e0887..c771a55e40d2a41d607a0da1b67cd1f7d546ccc8:/process.cpp?ds=inline diff --git a/process.cpp b/process.cpp index e9e2348..1a9066d 100644 --- a/process.cpp +++ b/process.cpp @@ -1,3 +1,5 @@ +#include "process.h" + #include #include #include @@ -7,7 +9,6 @@ #include #include "misc.h" #include "options.h" -#include "process.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu); @@ -17,13 +18,24 @@ process::process(int argc, char* argv[]) throw std::invalid_argument("bad or missing initial load"); neigh.assign(argv + 2, argv + argc); + + std::for_each(neigh.begin(), neigh.end(), + std::tr1::bind(&process::insert_neighbor_in_map, + this, std::tr1::placeholders::_1)); + expected_load = load; + ctrl_close_pending = data_close_pending = neigh.size(); + if (neigh.size() == 1) { + comm.next_close_on_ctrl_is_last(); + comm.next_close_on_data_is_last(); + } + if (neigh.size() > 0) + comm.listen(); e_xbt_log_priority_t logp = xbt_log_priority_verbose; if (!LOG_ISENABLED(logp)) return; - LOG1(logp, "My initial load is: %g", load); std::ostringstream oss; oss << neigh.size() << " neighbor"; if (!neigh.empty()) { @@ -39,49 +51,61 @@ process::process(int argc, char* argv[]) int process::run() { - INFO0("Coucou !"); + bool one_more = true; + + INFO1("Initial load: %g", load); + VERB0("Starting..."); + iter = 0; + while (one_more) { + ++iter; + + if (opt::log_rate && iter % opt::log_rate == 0) { + if (opt::bookkeeping) + INFO3("(%u) current load: %g ; expected: %g", + iter, load, expected_load); + else + INFO2("(%u) current load: %g", + iter, load); + } + + compute(); + + bool close_received = !receive(false); - int n = 100; - while (n--) { if (opt::bookkeeping) - INFO2("current load: %g ; expected: %g", load, expected_load); + expected_load -= load_balance(expected_load); else - INFO1("current load: %g", load); + load -= load_balance(load); - if (load > 0) - compute(); - else - xbt_sleep(100); // fixme - if (!receive(false)) - n = 0; + send(); + comm.flush(false); + + if (opt::exit_on_close && close_received) + one_more = false; + if (opt::maxiter && iter >= opt::maxiter) + one_more = false; } - DEBUG0("going to finalize."); + VERB0("Going to finalize..."); finalize(); - // MSG_process_sleep(100.0); // xxx - /* xxx: - * while (there is something to do) { - * compute some task; - * get received tasks; - * compute load balancing; - * send tasks to neighbors; - * } - * finalize; - * wait for pending messages; - */ - /* Open Questions : * - definition of load on heterogeneous hosts ? * - how to detect convergence ? * - how to manage link failures ? */ - DEBUG0("done."); + VERB0("Done."); + if (opt::bookkeeping) + INFO4("Final load after %d iteration%s: %g ; expected: %g", + iter, ESSE(iter), load, expected_load); + else + INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load); return 0; } void process::compute() { + // fixme: shall we do something special when duration is 0 ? double duration = opt::comp_cost(load); m_task_t task = MSG_task_create("computation", duration, 0.0, NULL); DEBUG2("compute %g flop%s.", duration, ESSE(duration)); @@ -89,6 +113,63 @@ void process::compute() MSG_task_destroy(task); } +double process::load_balance(double /*my_load*/) +{ + return 0.0; +} + +void process::send1_no_bookkeeping(neighbor& nb) +{ + comm.send(nb.get_ctrl_mbox(), new message(message::INFO, 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)); + nb.set_to_send(0.0); + } +} + +void process::send1_bookkeeping(neighbor& nb) +{ + comm.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.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; + } else { + new_debt = nb.get_debt(); + } + if (load <= new_debt) { + load_to_send = load; + nb.set_debt(new_debt - load_to_send); + load = 0.0; + } else { + load_to_send = new_debt; + nb.set_debt(0.0); + 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() +{ + // fixme: shall we send data at all iterations? + if (opt::bookkeeping) { + std::for_each(neigh.begin(), neigh.end(), + std::tr1::bind(&process::send1_bookkeeping, + this, std::tr1::placeholders::_1)); + } else { + std::for_each(neigh.begin(), neigh.end(), + std::tr1::bind(&process::send1_no_bookkeeping, + this, std::tr1::placeholders::_1)); + } +} + +// Returns false if a CLOSE message was received. bool process::receive(bool wait_for_close) { bool result = true; @@ -96,30 +177,30 @@ bool process::receive(bool wait_for_close) m_host_t from; while ((ctrl_close_pending || data_close_pending) && comm.recv(msg, from, wait_for_close)) { + DEBUG2("received %s from %s", + msg->to_string().c_str(), MSG_host_get_name(from)); switch (msg->get_type()) { - case message::INFO: - DEBUG0("received INFO"); - // fixme: update neighbor - // need a map m_host_t -> neighbor& + case message::INFO: { + neighbor* n = rev_neigh[from]; + n->set_load(msg->get_amount()); break; + } case message::CREDIT: - DEBUG0("received CREDIT"); expected_load += msg->get_amount(); break; case message::LOAD: - DEBUG0("received LOAD"); load += msg->get_amount(); break; case message::CTRL_CLOSE: - DEBUG0("received CTRL_CLOSE"); if (--ctrl_close_pending == 1) comm.next_close_on_ctrl_is_last(); + DEBUG1("ctrl_close_pending = %d", ctrl_close_pending); result = false; break; case message::DATA_CLOSE: - DEBUG0("received DATA_CLOSE"); if (--data_close_pending == 1) comm.next_close_on_data_is_last(); + DEBUG1("data_close_pending = %d", data_close_pending); result = false; break; } @@ -128,21 +209,25 @@ bool process::receive(bool wait_for_close) return result; } +void process::finalize1(neighbor& nb) +{ + comm.send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0)); + comm.send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0)); +} + void process::finalize() { DEBUG2("send CLOSE to %d neighbor%s.", (int )neigh.size(), ESSE(neigh.size())); - std::vector::iterator n; - for (n = neigh.begin() ; n != neigh.end() ; ++n) { - comm.send(n->get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0)); - comm.send(n->get_data_mbox(), new message(message::DATA_CLOSE, 0.0)); - } + std::for_each(neigh.begin(), neigh.end(), + std::tr1::bind(&process::finalize1, + this, std::tr1::placeholders::_1)); DEBUG2("wait for CLOSE from %d neighbor%s.", (int )neigh.size(), ESSE(neigh.size())); receive(true); - comm.wait_for_sent(); + comm.flush(true); } void process::print_loads(e_xbt_log_priority_t logp) @@ -162,6 +247,13 @@ void process::print_loads(e_xbt_log_priority_t logp) LOG1(logp, "Neighbor loads: %s", oss.str().c_str()); } +void process::insert_neighbor_in_map(neighbor& nb) +{ + neighbor* nbp = &nb; + m_host_t host = MSG_get_host_by_name(nb.get_name()); + rev_neigh.insert(std::make_pair(host, nbp)); +} + // Local variables: // mode: c++ // End: