X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/6f5ec5fdc42f96a8fe95f4b846b163d4dc92e0c8..b238ee6ba620f3b271cc16cc25a6838f42bdf537:/communicator.cpp?ds=inline diff --git a/communicator.cpp b/communicator.cpp index 93389c7..45e43a3 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -1,138 +1,221 @@ #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(); } -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()))) + , ctrl_task(NULL) + , ctrl_comm(NULL) + , data_task(NULL) + , data_comm(NULL) + , receiver_mutex(xbt_mutex_init()) + , receiver_cond(xbt_cond_init()) { - 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); + xbt_mutex_acquire(receiver_mutex); + receiver_thread = + MSG_process_create("receiver", communicator::receiver_wrapper, + this, MSG_host_self()); + // wait for the receiver to be ready + xbt_cond_wait(receiver_cond, receiver_mutex); + xbt_mutex_release(receiver_mutex); } 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, get_ctrl_mbox()); - free(data_mbox); - free(ctrl_mbox); + XBT_DEBUG("send finalize to receiver/data"); + task = MSG_task_create("finalize", 0.0, 0, NULL); + MSG_task_send(task, get_data_mbox()); - flush_sent(); + xbt_mutex_acquire(receiver_mutex); + while (receiver_thread) { + XBT_DEBUG("waiting for receiver to terminate"); + xbt_cond_wait(receiver_cond, receiver_mutex); + } + xbt_mutex_release(receiver_mutex); + + if (ctrl_comm) + XBT_WARN("ctrl_comm is pending!"); + if (data_comm) + XBT_WARN("data_comm is pending!"); + 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_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); + xbt_cond_destroy(receiver_cond); + xbt_mutex_destroy(receiver_mutex); } -void communicator::send_credit(const neighbor& dest, double amount) +void communicator::send(const char* dest, message* msg) { - 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); + 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); + 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); } -void communicator::send_load(const neighbor& dest, double amount) +bool communicator::recv(message*& msg, m_host_t& from, double timeout) { - m_task_t task = MSG_task_create("data msg", 0.0, amount, NULL); - send(dest.get_data_mbox(), task); + if (timeout != 0) { + volatile double deadline = + timeout > 0 ? MSG_get_clock() + timeout : 0.0; + xbt_mutex_acquire(receiver_mutex); + while (received.empty() && (!deadline || deadline > MSG_get_clock())) { + xbt_ex_t e; + XBT_DEBUG("waiting for a message to come"); + TRY { + if (deadline) + xbt_cond_timedwait(receiver_cond, receiver_mutex, + deadline - MSG_get_clock()); + else + xbt_cond_wait(receiver_cond, receiver_mutex); + } + CATCH (e) { + if (e.category != timeout_error) + RETHROW; + xbt_ex_free(e); + } + } + xbt_mutex_release(receiver_mutex); + } + + 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::send(const char* dest, m_task_t task) +void communicator::flush(bool wait) { - sent_comm.push_back(MSG_task_isend(task, dest)); - flush_sent(); + 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(), MSG_comm_destroy); + sent_comm.clear(); + } } -bool communicator::recv_info(double& amount, m_host_t& from) +bool communicator::comm_test_n_destroy(msg_comm_t comm) { - return recv_ctrl(INFO_MSG, amount, from); + if (MSG_comm_test(comm)) { + MSG_comm_destroy(comm); + return true; + } else + return false; } -bool communicator::recv_credit(double& amount, m_host_t& from) +int communicator::receiver_wrapper(int, char* []) { - return recv_ctrl(CREDIT_MSG, amount, from); + communicator* comm; + comm = static_cast(MSG_process_get_data(MSG_process_self())); + int result = comm->receiver(); + + XBT_DEBUG("terminate"); + xbt_mutex_acquire(comm->receiver_mutex); + comm->receiver_thread = NULL; + xbt_cond_signal(comm->receiver_cond); + xbt_mutex_release(comm->receiver_mutex); + + return result; } -bool communicator::recv_load(double& amount, m_host_t& from) +void communicator::receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox) { - 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); + MSG_comm_destroy(comm); + if (strcmp(MSG_task_get_name(task), "finalize")) { + XBT_DEBUG("received message on %s", mbox); + xbt_mutex_acquire(receiver_mutex); + received.push(task); + xbt_cond_signal(receiver_cond); + xbt_mutex_release(receiver_mutex); + task = NULL; + comm = MSG_task_irecv(&task, mbox); + } else { + XBT_DEBUG("received finalize on %s", mbox); + MSG_task_destroy(task); + task = NULL; + comm = NULL; } - return res; } -bool communicator::recv_ctrl(message_type type, double& amount, m_host_t& from) +int communicator::receiver() { - 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); - } else { - res = false; + ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox()); + data_comm = MSG_task_irecv(&data_task, get_data_mbox()); + XBT_DEBUG("receiver ready"); + xbt_mutex_acquire(receiver_mutex); + xbt_cond_signal(receiver_cond); // signal master that we are ready + xbt_mutex_release(receiver_mutex); + + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + while (ctrl_comm || data_comm) { + + if (ctrl_comm) + xbt_dynar_push(comms, &ctrl_comm); + if (data_comm) + xbt_dynar_push(comms, &data_comm); + int index = MSG_comm_waitany(comms); + msg_comm_t finished_comm = xbt_dynar_get_as(comms, index, msg_comm_t); + xbt_dynar_reset(comms); + + if (finished_comm == ctrl_comm) + receiver1(ctrl_comm, ctrl_task, get_ctrl_mbox()); + else if (finished_comm == data_comm) + receiver1(data_comm, data_task, get_data_mbox()); + else { + XBT_ERROR("Handling unknown comm -- %p", finished_comm); + MSG_comm_destroy(finished_comm); } } - return res; -} - -int communicator::send_backlog() -{ - flush_sent(); - return sent_comm.size(); -} - -void communicator::flush_sent() -{ - std::remove_if(sent_comm.begin(), sent_comm.end(), comm_test_n_destroy); + xbt_dynar_free(&comms); + return 0; } // Local variables: