X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/6f5ec5fdc42f96a8fe95f4b846b163d4dc92e0c8..f2a9af6fd7e7a0294d07aff678960134ba771ffa:/communicator.cpp diff --git a/communicator.cpp b/communicator.cpp index 93389c7..2ddea5d 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -1,138 +1,141 @@ #include -#include +#include #include #include -#include "communicator.h" + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm); + +#include "misc.h" #include "simgrid_features.h" +#include "tracing.h" -// XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm, simu, - "Messages from asynchronous pipes"); +#include "communicator.h" namespace { - bool comm_test_n_destroy(msg_comm_t& comm) + void check_for_lost_messages(size_t size, const char* descr) { - if (MSG_comm_test(comm)) { - MSG_comm_destroy(comm); - return true; - } else - return false; + if (size) + XBT_WARN("lost %zu %s message%s!", size, descr, ESSE(size)); } } -class communicator::message { -public: - message(message_type t, double a): type(t), amount(a) { } - - message_type type; - double amount; -}; - communicator::communicator() + : host(static_cast(MSG_host_get_data(MSG_host_self()))) { - const char* hostname = MSG_host_get_name(MSG_host_self()); - ctrl_mbox = bprintf("%s_ctrl", hostname); - ctrl_task = NULL; - ctrl_comm = MSG_task_irecv(&ctrl_task, ctrl_mbox); - - data_mbox = bprintf("%s_data", hostname); - data_task = NULL; - data_comm = MSG_task_irecv(&data_task, data_mbox); + receiver_thread = new_msg_thread("receiver", + std::bind(&communicator::receiver, this)); + receiver_thread->start(); } communicator::~communicator() { - // fixme: don't know how to free pending communications - // (data_comm, ctrl_comm and sent_comm) + m_task_t task; - free(data_mbox); - free(ctrl_mbox); + XBT_DEBUG("send finalize to receiver/ctrl"); + task = MSG_task_create("finalize", 0.0, 0, NULL); + MSG_task_send(task, host->get_ctrl_mbox()); - flush_sent(); - if (!sent_comm.empty()) - WARN1("Lost %ld send communications!", (long )sent_comm.size()); -} + XBT_DEBUG("send finalize to receiver/data"); + task = MSG_task_create("finalize", 0.0, 0, NULL); + MSG_task_send(task, host->get_data_mbox()); -void communicator::send_info(const neighbor& dest, double amount) -{ - message* msg = new message(INFO_MSG, amount); - m_task_t task = MSG_task_create("load msg", 0.0, sizeof *msg, msg); - send(dest.get_ctrl_mbox(), task); -} + receiver_thread->wait(); + delete receiver_thread; -void communicator::send_credit(const neighbor& dest, double amount) -{ - message* msg = new message(CREDIT_MSG, amount); - m_task_t task = MSG_task_create("credit msg", 0.0, sizeof *msg, msg); - send(dest.get_ctrl_mbox(), task); + check_for_lost_messages(ctrl_received.size(), "received ctrl"); + check_for_lost_messages(data_received.size(), "received data"); + check_for_lost_messages(ctrl_sent.size(), "sent ctrl"); + check_for_lost_messages(data_sent.size(), "sent data"); } -void communicator::send_load(const neighbor& dest, double amount) +msg_comm_t communicator::real_send(const char* dest, message* msg) { - m_task_t task = MSG_task_create("data msg", 0.0, amount, NULL); - send(dest.get_data_mbox(), task); + XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest); + m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg); + TRACE_msg_set_task_category(task, + msg->get_type() == message::DATA ? + TRACE_CAT_DATA : TRACE_CAT_CTRL); + return MSG_task_isend(task, dest); } -void communicator::send(const char* dest, m_task_t task) +void communicator::real_flush(sent_comm_type& sent_comm, bool wait) { - sent_comm.push_back(MSG_task_isend(task, dest)); - flush_sent(); + sent_comm_type::iterator bound = + std::remove_if(sent_comm.begin(), sent_comm.end(), + comm_test_n_destroy); + sent_comm.erase(bound, sent_comm.end()); + if (wait && !sent_comm.empty()) { + size_t size = sent_comm.size(); + msg_comm_t* comms = new msg_comm_t[size]; + std::copy(sent_comm.begin(), sent_comm.end(), comms); + sent_comm.clear(); + MSG_comm_waitall(comms, size, -1.0); + std::for_each(comms, comms + size, comm_check_n_destroy); + delete[] comms; + } } -bool communicator::recv_info(double& amount, m_host_t& from) +void communicator::receiver() { - return recv_ctrl(INFO_MSG, amount, from); -} + 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; + message_queue& received; + }; + channel chan[] = { { NULL, NULL, host->get_ctrl_mbox(), ctrl_received }, + { NULL, NULL, host->get_data_mbox(), data_received } }; + 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); + } -bool communicator::recv_credit(double& amount, m_host_t& from) -{ - return recv_ctrl(CREDIT_MSG, amount, from); -} + while (!xbt_dynar_is_empty(comms)) { -bool communicator::recv_load(double& amount, m_host_t& from) -{ - bool res = comm_test_n_destroy(data_comm); - if (res) { - amount = MSG_task_get_data_size(data_task); - from = MSG_task_get_source(data_task); - MSG_task_destroy(data_task); - data_task = NULL; - data_comm = MSG_task_irecv(&data_task, data_mbox); - } - return res; -} + int index = MSG_comm_waitany(comms); + msg_comm_t finished_comm = xbt_dynar_get_as(comms, index, msg_comm_t); + channel* ch; -bool communicator::recv_ctrl(message_type type, double& amount, m_host_t& from) -{ - bool res = MSG_comm_test(ctrl_comm); - if (res) { - message* msg = (message* )MSG_task_get_data(ctrl_task); - if (msg->type == type) { - MSG_comm_destroy(ctrl_comm); - amount = msg->amount; - from = MSG_task_get_source(ctrl_task); - delete msg; - MSG_task_destroy(ctrl_task); - ctrl_task = NULL; - ctrl_comm = MSG_task_irecv(&ctrl_task, ctrl_mbox); + 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); + ch->received.push(ch->task); + ch->task = NULL; + ch->comm = MSG_task_irecv(&ch->task, ch->mbox); + xbt_dynar_set_as(comms, index, msg_comm_t, ch->comm); } else { - res = false; + 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); } + } - return res; + 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: