X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/c771a55e40d2a41d607a0da1b67cd1f7d546ccc8..f2a9af6fd7e7a0294d07aff678960134ba771ffa:/communicator.cpp?ds=sidebyside diff --git a/communicator.cpp b/communicator.cpp index 4b54161..2ddea5d 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -1,142 +1,138 @@ -#include "communicator.h" - #include -#include -#include +#include #include #include -#include "simgrid_features.h" + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm); + #include "misc.h" +#include "simgrid_features.h" +#include "tracing.h" + +#include "communicator.h" -// XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm, simu, - "Messages from asynchronous pipes"); +namespace { + + void check_for_lost_messages(size_t size, const char* descr) + { + if (size) + XBT_WARN("lost %zu %s message%s!", size, descr, ESSE(size)); + } -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((hostdata* )MSG_host_get_data(MSG_host_self())) - , ctrl_task(NULL) - , ctrl_comm(NULL) - , ctrl_close_is_last(false) - , data_task(NULL) - , data_comm(NULL) - , data_close_is_last(false) + : host(static_cast(MSG_host_get_data(MSG_host_self()))) { + receiver_thread = new_msg_thread("receiver", + std::bind(&communicator::receiver, this)); + receiver_thread->start(); } communicator::~communicator() { - if (ctrl_comm) - WARN0("ctrl_comm is pending!"); - if (data_comm) - WARN0("data_comm is pending!"); - if (!sent_comm.empty()) - WARN2("lost %ld send communication%s!", - (long )sent_comm.size(), ESSE(sent_comm.size())); -} + m_task_t task; -void communicator::listen() -{ - ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox()); - data_comm = MSG_task_irecv(&data_task, get_data_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()); -void communicator::send(const char* dest, message* msg) -{ - double msg_size = sizeof *msg; - if (msg->get_type() == message::LOAD) - msg_size += msg->get_amount(); - m_task_t task = MSG_task_create("message", 0.0, msg_size, msg); - msg_comm_t comm = MSG_task_isend(task, dest); - sent_comm.push_back(comm); -} + XBT_DEBUG("send finalize to receiver/data"); + task = MSG_task_create("finalize", 0.0, 0, NULL); + MSG_task_send(task, host->get_data_mbox()); -bool communicator::recv(message*& msg, m_host_t& from, bool wait) -{ - bool restart; - msg = NULL; - - 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; - } + receiver_thread->wait(); + delete receiver_thread; - 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); + 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"); +} - return msg != NULL; +msg_comm_t communicator::real_send(const char* dest, message* msg) +{ + 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::flush(bool wait) +void communicator::real_flush(sent_comm_type& sent_comm, bool wait) { - sent_comm.remove_if(comm_test_n_destroy); + 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()) { - 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(), - std::tr1::bind(comm_push_in_dynar, - comms, std::tr1::placeholders::_1)); - MSG_comm_waitany(comms); - xbt_dynar_reset(comms); - sent_comm.remove_if(comm_test_n_destroy); - } - xbt_dynar_free(&comms); + 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; } } -void communicator::next_close_on_ctrl_is_last() +void communicator::receiver() { - ctrl_close_is_last = true; -} + 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); + } -void communicator::next_close_on_data_is_last() -{ - data_close_is_last = true; + 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); + 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 { + 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); } -void communicator::comm_push_in_dynar(xbt_dynar_t dynar, msg_comm_t comm) +void communicator::comm_check_n_destroy(msg_comm_t comm) { - xbt_dynar_push(dynar, &comm); + xbt_assert(MSG_comm_get_status(comm) == MSG_OK); + MSG_comm_destroy(comm); } bool communicator::comm_test_n_destroy(msg_comm_t comm) { if (MSG_comm_test(comm)) { - MSG_comm_destroy(comm); + comm_check_n_destroy(comm); return true; } else return false;