X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/f4125505064e3ff346b31ab9e48f894672e5a7a7..ef1ef576d25c492dc585240b8a4b36954fc00140:/communicator.cpp diff --git a/communicator.cpp b/communicator.cpp index da5e2b5..f3e6bf9 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -1,92 +1,155 @@ #include -#include +#include +#include #include #include -#include "communicator.h" -#include "simgrid_features.h" -// XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm, simu, - "Messages from asynchronous pipes"); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm); -namespace { +#include "misc.h" +#include "options.h" - bool comm_test_n_destroy(msg_comm_t& comm) - { - if (MSG_comm_test(comm)) { - MSG_comm_destroy(comm); - return true; - } else - return false; - } +#include "communicator.h" +std::string message::to_string() +{ + static const char* str[] = { "INFO", "CREDIT", "LOAD", + "CTRL_CLOSE", "DATA_CLOSE" }; + std::ostringstream oss; + oss << str[type] << ": " << amount; + return oss.str(); } +const int communicator::send_count_before_flush = 4; + communicator::communicator() + : host((hostdata* )MSG_host_get_data(MSG_host_self())) + , send_counter(0) + , ctrl_task(NULL) + , ctrl_comm(NULL) + , ctrl_close_is_last(false) + , data_task(NULL) + , data_comm(NULL) + , data_close_is_last(false) { - const char* hostname = MSG_host_get_name(MSG_host_self()); - ctrl_mbox = hostname; - ctrl_mbox += "_ctrl"; - ctrl_task = NULL; - ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox()); - - data_mbox = hostname; - data_mbox += "_data"; - data_task = NULL; - data_comm = MSG_task_irecv(&data_task, get_data_mbox()); } communicator::~communicator() { - // fixme: don't know how to free pending communications - // (data_comm, ctrl_comm and sent_comm) - - flush_sent(); + if (ctrl_comm) + WARN0("ctrl_comm is pending!"); + if (data_comm) + WARN0("data_comm is pending!"); if (!sent_comm.empty()) - WARN1("Lost %ld send communications!", (long )sent_comm.size()); + WARN2("lost %ld send communication%s!", + (long )sent_comm.size(), ESSE(sent_comm.size())); +} + +void communicator::listen() +{ + ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox()); + data_comm = MSG_task_irecv(&data_task, get_data_mbox()); } void communicator::send(const char* dest, message* msg) { + DEBUG2("send %s to %s", msg->to_string().c_str(), dest); double msg_size = sizeof *msg; if (msg->get_type() == message::LOAD) - msg_size += msg->get_amount(); + msg_size += opt::comm_cost(msg->get_amount()); m_task_t task = MSG_task_create("message", 0.0, msg_size, msg); - sent_comm.push_back(MSG_task_isend(task, dest)); - flush_sent(); + msg_comm_t comm = MSG_task_isend(task, dest); + sent_comm.push_back(comm); + + if (++send_counter >= send_count_before_flush) { + flush(false); + send_counter = 0; + } } -bool communicator::recv(message*& msg, m_host_t& from) +bool communicator::recv(message*& msg, m_host_t& from, bool wait) { + bool restart; msg = NULL; - if (comm_test_n_destroy(ctrl_comm)) { - msg = (message* )MSG_task_get_data(ctrl_task); - from = MSG_task_get_source(ctrl_task); - MSG_task_destroy(ctrl_task); - ctrl_task = NULL; - ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox()); - - } else if (comm_test_n_destroy(data_comm)) { - msg = (message* )MSG_task_get_data(data_task); - from = MSG_task_get_source(data_task); - MSG_task_destroy(data_task); - data_task = NULL; - data_comm = MSG_task_irecv(&data_task, get_data_mbox()); - } + do { + if (ctrl_comm && comm_test_n_destroy(ctrl_comm)) { + msg = (message* )MSG_task_get_data(ctrl_task); + from = MSG_task_get_source(ctrl_task); + MSG_task_destroy(ctrl_task); + ctrl_task = NULL; + ctrl_comm = + (!ctrl_close_is_last || msg->get_type() != message::CTRL_CLOSE) + ? MSG_task_irecv(&ctrl_task, get_ctrl_mbox()) + : NULL; + + } else if (data_comm && comm_test_n_destroy(data_comm)) { + msg = (message* )MSG_task_get_data(data_task); + from = MSG_task_get_source(data_task); + MSG_task_destroy(data_task); + data_task = NULL; + data_comm = + (!data_close_is_last || msg->get_type() != message::DATA_CLOSE) + ? MSG_task_irecv(&data_task, get_data_mbox()) + : NULL; + } + + restart = wait && !msg && (ctrl_comm || data_comm); + if (restart) { + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + if (ctrl_comm) + xbt_dynar_push(comms, &ctrl_comm); + if (data_comm) + xbt_dynar_push(comms, &data_comm); + MSG_comm_waitany(comms); + xbt_dynar_free(&comms); + } + } while (restart); + + if (msg) + DEBUG2("received %s from %s", + msg->to_string().c_str(), MSG_host_get_name(from)); return msg != NULL; } -int communicator::send_backlog() +void communicator::flush(bool wait) +{ + using std::tr1::bind; + using std::tr1::placeholders::_1; + + sent_comm.remove_if(comm_test_n_destroy); + if (wait && !sent_comm.empty()) { + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + while (!sent_comm.empty()) { + std::for_each(sent_comm.begin(), sent_comm.end(), + bind(xbt_dynar_push, + comms, bind(misc::address(), _1))); + MSG_comm_waitany(comms); + xbt_dynar_reset(comms); + sent_comm.remove_if(comm_test_n_destroy); + } + xbt_dynar_free(&comms); + } +} + +void communicator::next_close_on_ctrl_is_last() +{ + ctrl_close_is_last = true; +} + +void communicator::next_close_on_data_is_last() { - flush_sent(); - return sent_comm.size(); + data_close_is_last = true; } -void communicator::flush_sent() +bool communicator::comm_test_n_destroy(msg_comm_t comm) { - std::remove_if(sent_comm.begin(), sent_comm.end(), comm_test_n_destroy); + if (MSG_comm_test(comm)) { + MSG_comm_destroy(comm); + return true; + } else + return false; } // Local variables: