X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/f4125505064e3ff346b31ab9e48f894672e5a7a7..82a490fdda330eb916eb059929de4be817fe8a87:/communicator.cpp?ds=sidebyside diff --git a/communicator.cpp b/communicator.cpp index da5e2b5..506f126 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -1,92 +1,215 @@ #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" +#include "simgrid_features.h" +#include "tracing.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(); } communicator::communicator() + : host(static_cast(MSG_host_get_data(MSG_host_self()))) { - 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()); + receiver_mutex.acquire(); + receiver_thread = + MSG_process_create("receiver", communicator::receiver_wrapper, + this, MSG_host_self()); + receiver_cond.wait(receiver_mutex); // wait for the receiver to be ready + receiver_mutex.release(); } communicator::~communicator() { - // fixme: don't know how to free pending communications - // (data_comm, ctrl_comm and sent_comm) + m_task_t task; + + XBT_DEBUG("send finalize to receiver/ctrl"); + task = MSG_task_create("finalize", 0.0, 0, NULL); + MSG_task_send(task, host->get_ctrl_mbox()); + + XBT_DEBUG("send finalize to receiver/data"); + task = MSG_task_create("finalize", 0.0, 0, NULL); + MSG_task_send(task, host->get_data_mbox()); - flush_sent(); + receiver_mutex.acquire(); + while (receiver_thread) { + XBT_DEBUG("waiting for receiver to terminate"); + receiver_cond.wait(receiver_mutex); + } + receiver_mutex.release(); + + if (!received.empty()) + XBT_WARN("lost %zu received message%s!", + received.size(), ESSE(received.size())); if (!sent_comm.empty()) - WARN1("Lost %ld send communications!", (long )sent_comm.size()); + XBT_WARN("lost %zu sent message%s!", + sent_comm.size(), ESSE(sent_comm.size())); } void communicator::send(const char* dest, message* msg) { + XBT_DEBUG("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(); + TRACE_msg_set_task_category(task, + msg->get_type() == message::LOAD ? + TRACE_CAT_DATA : TRACE_CAT_CTRL); + msg_comm_t comm = MSG_task_isend(task, dest); + sent_comm.push_back(comm); } -bool communicator::recv(message*& msg, m_host_t& from) +bool communicator::recv(message*& msg, m_host_t& from, double timeout) { - 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()); + if (timeout != 0) { + volatile double deadline = + timeout > 0 ? MSG_get_clock() + timeout : 0.0; + receiver_mutex.acquire(); + while (received.empty() && (!deadline || deadline > MSG_get_clock())) { + xbt_ex_t e; + XBT_DEBUG("waiting for a message to come"); + TRY { + if (deadline) + receiver_cond.timedwait(receiver_mutex, + deadline - MSG_get_clock()); + else + receiver_cond.wait(receiver_mutex); + } + CATCH (e) { + if (e.category != timeout_error) + RETHROW; + xbt_ex_free(e); + } + } + receiver_mutex.release(); } - return msg != NULL; + if (received.empty()) + return false; + + m_task_t task = received.front(); + received.pop(); + msg = static_cast(MSG_task_get_data(task)); + from = MSG_task_get_source(task); + MSG_task_destroy(task); + + XBT_DEBUG("received %s from %s", + msg->to_string().c_str(), MSG_host_get_name(from)); + + return true; +} + +void communicator::flush(bool wait) +{ + sent_comm.remove_if(comm_test_n_destroy); + if (wait && !sent_comm.empty()) { + msg_comm_t comms[sent_comm.size()]; + std::copy(sent_comm.begin(), sent_comm.end(), comms); + MSG_comm_waitall(comms, sent_comm.size(), -1.0); + if (!MSG_WAIT_DESTROYS_COMMS) + std::for_each(sent_comm.begin(), sent_comm.end(), + comm_check_n_destroy); + sent_comm.clear(); + } +} + +int communicator::receiver_wrapper(int, char* []) +{ + communicator* comm; + comm = static_cast(MSG_process_get_data(MSG_process_self())); + comm->receiver(); + + XBT_DEBUG("terminate"); + comm->receiver_mutex.acquire(); + comm->receiver_thread = NULL; + comm->receiver_cond.signal(); + comm->receiver_mutex.release(); + + return 0; +} + +void communicator::receiver() +{ + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + struct channel { + msg_comm_t comm; + m_task_t task; + const char* mbox; + }; + channel chan[] = { { NULL, NULL, host->get_ctrl_mbox() }, + { NULL, NULL, host->get_data_mbox() } }; + const int chan_size = (sizeof chan) / (sizeof chan[0]); + + for (int i = 0 ; i < chan_size ; ++i) { + chan[i].comm = MSG_task_irecv(&chan[i].task, chan[i].mbox); + xbt_dynar_push(comms, &chan[i].comm); + } + + XBT_DEBUG("receiver ready"); + receiver_mutex.acquire(); + receiver_cond.signal(); // signal master that we are ready + receiver_mutex.release(); + + while (!xbt_dynar_is_empty(comms)) { + + int index = MSG_comm_waitany(comms); + msg_comm_t finished_comm = xbt_dynar_get_as(comms, index, msg_comm_t); + channel* ch; + + for (ch = chan ; ch->comm != finished_comm ; ++ch) + /* nop */; + + comm_check_n_destroy(ch->comm); + if (strcmp(MSG_task_get_name(ch->task), "finalize")) { + XBT_DEBUG("received message on %s", ch->mbox); + receiver_mutex.acquire(); + received.push(ch->task); + receiver_cond.signal(); + receiver_mutex.release(); + ch->task = NULL; + ch->comm = MSG_task_irecv(&ch->task, ch->mbox); + xbt_dynar_set_as(comms, index, msg_comm_t, ch->comm); + } else { + XBT_DEBUG("received finalize on %s", ch->mbox); + MSG_task_destroy(ch->task); + ch->task = NULL; + ch->comm = NULL; + xbt_dynar_remove_at(comms, index, NULL); + } + + } + xbt_dynar_free(&comms); } -int communicator::send_backlog() +void communicator::comm_check_n_destroy(msg_comm_t comm) { - flush_sent(); - return sent_comm.size(); + xbt_assert(MSG_comm_get_status(comm) == MSG_OK); + MSG_comm_destroy(comm); } -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)) { + comm_check_n_destroy(comm); + return true; + } else + return false; } // Local variables: