From f2850cc1d935992994177c2c266141d5304d4694 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 8 Feb 2011 17:35:33 +0100 Subject: [PATCH] Cleanups on communicator. --- communicator.cpp | 84 +++++++++++++++++++++++------------------------- communicator.h | 12 ------- 2 files changed, 40 insertions(+), 56 deletions(-) diff --git a/communicator.cpp b/communicator.cpp index 1bf16cd..96cd598 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -25,10 +25,6 @@ std::string message::to_string() 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()) { @@ -47,11 +43,11 @@ communicator::~communicator() XBT_DEBUG("send finalize to receiver/ctrl"); task = MSG_task_create("finalize", 0.0, 0, NULL); - MSG_task_send(task, get_ctrl_mbox()); + 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, get_data_mbox()); + MSG_task_send(task, host->get_data_mbox()); xbt_mutex_acquire(receiver_mutex); while (receiver_thread) { @@ -60,10 +56,6 @@ communicator::~communicator() } 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())); @@ -158,51 +150,55 @@ int communicator::receiver_wrapper(int, char* []) return 0; } -void communicator::receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox) +void communicator::receiver() { - comm_check_n_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; + 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); } -} -void communicator::receiver() -{ - 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) { + while (!xbt_dynar_is_empty(comms)) { - 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 - THROW1(0, 0, "Cannot handle unknown comm -- %p", finished_comm); + 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); + xbt_mutex_acquire(receiver_mutex); + received.push(ch->task); + xbt_cond_signal(receiver_cond); + xbt_mutex_release(receiver_mutex); + 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); } diff --git a/communicator.h b/communicator.h index 091594f..c335920 100644 --- a/communicator.h +++ b/communicator.h @@ -52,23 +52,11 @@ private: // Queue of received messages std::queue received; - // Control channel for receiving - m_task_t ctrl_task; // receive buffer - msg_comm_t ctrl_comm; // receive communication - - // Data channel for receiving - m_task_t data_task; // receive buffer - msg_comm_t data_comm; // receive communication - - const char* get_ctrl_mbox() const { return host->get_ctrl_mbox(); } - const char* get_data_mbox() const { return host->get_data_mbox(); } - // Handling of receiving thread xbt_mutex_t receiver_mutex; xbt_cond_t receiver_cond; m_process_t receiver_thread; static int receiver_wrapper(int, char* []); - void receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox); void receiver(); // Used to chek if a communication is successfull before destroying it -- 2.39.5