X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/892e36c1af3105e5f548a4ef8b9f777b95d47fc2..1c3da8681b394ce3b14fb44e27cb682c045d5f92:/communicator.cpp?ds=sidebyside diff --git a/communicator.cpp b/communicator.cpp index 3516b68..e6a47b4 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -1,25 +1,32 @@ #include +#include #include #include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm); #include "misc.h" -#include "options.h" #include "simgrid_features.h" #include "tracing.h" #include "communicator.h" +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)); + } + +} + communicator::communicator() : host(static_cast(MSG_host_get_data(MSG_host_self()))) { - 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(); + receiver_thread = new_msg_thread("receiver", + std::bind(&communicator::receiver, this)); + receiver_thread->start(); } communicator::~communicator() @@ -34,74 +41,42 @@ communicator::~communicator() task = MSG_task_create("finalize", 0.0, 0, NULL); MSG_task_send(task, host->get_data_mbox()); - 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()) - XBT_WARN("lost %zu sent message%s!", - sent_comm.size(), ESSE(sent_comm.size())); + receiver_thread->wait(); + delete receiver_thread; + + 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(const char* dest, message* msg) +msg_comm_t communicator::real_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 += opt::comm_cost(msg->get_amount()); - m_task_t task = MSG_task_create("message", 0.0, msg_size, msg); + m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg); 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); + 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()) { - msg_comm_t comms[sent_comm.size()]; + size_t size = sent_comm.size(); + msg_comm_t* comms = new msg_comm_t[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(); + MSG_comm_waitall(comms, size, -1.0); + std::for_each(comms, comms + size, comm_check_n_destroy); + delete[] comms; } } -bool communicator::recv(message*& msg, m_host_t& from, double timeout) -{ - XBT_DEBUG("waiting for a message to come"); - bool recvd = received.pop(msg, from, timeout); - if (recvd) - XBT_DEBUG("received %s from %s", - msg->to_string().c_str(), MSG_host_get_name(from)); - return recvd; -} - -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); @@ -109,9 +84,10 @@ void communicator::receiver() msg_comm_t comm; m_task_t task; const char* mbox; + message_queue& received; }; - channel chan[] = { { NULL, NULL, host->get_ctrl_mbox() }, - { NULL, NULL, host->get_data_mbox() } }; + 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) { @@ -119,11 +95,6 @@ void communicator::receiver() 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); @@ -136,7 +107,7 @@ void communicator::receiver() comm_check_n_destroy(ch->comm); if (strcmp(MSG_task_get_name(ch->task), "finalize")) { XBT_DEBUG("received message on %s", ch->mbox); - received.push(ch->task); + 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);