X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4f8948b8f67d26726a2e53c9afe1a110c037ce4b..92d7eb81980a40dda0715b23e874a1537cf3adb8:/process.cpp?ds=sidebyside diff --git a/process.cpp b/process.cpp index e1232f2..ed7be05 100644 --- a/process.cpp +++ b/process.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -10,18 +11,22 @@ #include "misc.h" #include "options.h" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); process::process(int argc, char* argv[]) { if (argc < 2 || !(std::istringstream(argv[1]) >> load)) - throw std::invalid_argument("bad or missing initial load"); + throw std::invalid_argument("bad or missing initial load parameter"); 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)); + pneigh.reserve(neigh.size()); + for (unsigned i = 0 ; i < neigh.size() ; i++) { + neighbor* ptr = &neigh[i]; + m_host_t host = MSG_get_host_by_name(ptr->get_name()); + pneigh.push_back(ptr); + rev_neigh.insert(std::make_pair(host, ptr)); + } expected_load = load; @@ -59,10 +64,11 @@ int process::run() INFO1("Initial load: %g", load); VERB0("Starting..."); + // first send() to inform neighbors about our load (force it) + prev_load_broadcast = !(opt::bookkeeping? expected_load: load); + send(); 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", @@ -71,10 +77,15 @@ int process::run() INFO2("(%u) current load: %g", iter, load); } + print_loads(xbt_log_priority_debug); - compute(); + bool do_compute = load > 0.0; + if (do_compute) { + compute(); + ++iter; + } - bool close_received = !receive(false); + bool close_received = !receive(do_compute? NO_WAIT: WAIT); if (opt::bookkeeping) expected_load -= load_balance(expected_load); @@ -82,7 +93,6 @@ int process::run() load -= load_balance(load); send(); - comm.flush(false); if (opt::exit_on_close && close_received) one_more = false; @@ -107,9 +117,25 @@ int process::run() return 0; } +double process::sum_of_to_send() const +{ + using namespace std::tr1; + using namespace std::tr1::placeholders; + + 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*/) +{ + if (iter == 1) + WARN0("process::load_balance is a no-op!"); + return 0.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)); @@ -117,14 +143,10 @@ 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)); + if (load != prev_load_broadcast) + 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)); @@ -134,7 +156,9 @@ void process::send1_no_bookkeeping(neighbor& nb) void process::send1_bookkeeping(neighbor& nb) { - comm.send(nb.get_ctrl_mbox(), new message(message::INFO, expected_load)); + if (expected_load != prev_load_broadcast) + 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(); @@ -161,28 +185,29 @@ void process::send1_bookkeeping(neighbor& nb) void process::send() { + using namespace std::tr1; + using namespace std::tr1::placeholders; + // 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)); + bind(&process::send1_bookkeeping, this, _1)); + prev_load_broadcast = expected_load; } else { std::for_each(neigh.begin(), neigh.end(), - std::tr1::bind(&process::send1_no_bookkeeping, - this, std::tr1::placeholders::_1)); + bind(&process::send1_no_bookkeeping, this, _1)); + prev_load_broadcast = load; } } // Returns false if a CLOSE message was received. -bool process::receive(bool wait_for_close) +bool process::receive(recv_wait_mode wait) { bool result = true; message* msg; 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)); + bool do_recv = ctrl_close_pending || data_close_pending; + while (do_recv && comm.recv(msg, from, wait)) { switch (msg->get_type()) { case message::INFO: { neighbor* n = rev_neigh[from]; @@ -209,6 +234,8 @@ bool process::receive(bool wait_for_close) break; } delete msg; + do_recv = (wait == WAIT_FOR_CLOSE) && + (ctrl_close_pending || data_close_pending); } return result; } @@ -221,15 +248,17 @@ void process::finalize1(neighbor& nb) void process::finalize() { + using namespace std::tr1; + using namespace std::tr1::placeholders; + DEBUG2("send CLOSE to %d neighbor%s.", (int )neigh.size(), ESSE(neigh.size())); std::for_each(neigh.begin(), neigh.end(), - std::tr1::bind(&process::finalize1, - this, std::tr1::placeholders::_1)); + bind(&process::finalize1, this, _1)); DEBUG2("wait for CLOSE from %d neighbor%s.", (int )neigh.size(), ESSE(neigh.size())); - receive(true); + receive(WAIT_FOR_CLOSE); comm.flush(true); } @@ -251,13 +280,6 @@ 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: