X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4ed2ded99f037e413c9008a324c85f8f95611bb5..82a490fdda330eb916eb059929de4be817fe8a87:/communicator.cpp?ds=sidebyside diff --git a/communicator.cpp b/communicator.cpp index 1bf16cd..506f126 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -25,20 +25,13 @@ 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()) { - xbt_mutex_acquire(receiver_mutex); + receiver_mutex.acquire(); 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); + receiver_cond.wait(receiver_mutex); // wait for the receiver to be ready + receiver_mutex.release(); } communicator::~communicator() @@ -47,32 +40,25 @@ 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); + receiver_mutex.acquire(); while (receiver_thread) { XBT_DEBUG("waiting for receiver to terminate"); - xbt_cond_wait(receiver_cond, receiver_mutex); + receiver_cond.wait(receiver_mutex); } - xbt_mutex_release(receiver_mutex); + receiver_mutex.release(); - 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()) XBT_WARN("lost %zu sent message%s!", sent_comm.size(), ESSE(sent_comm.size())); - - xbt_cond_destroy(receiver_cond); - xbt_mutex_destroy(receiver_mutex); } void communicator::send(const char* dest, message* msg) @@ -94,16 +80,16 @@ bool communicator::recv(message*& msg, m_host_t& from, double timeout) if (timeout != 0) { volatile double deadline = timeout > 0 ? MSG_get_clock() + timeout : 0.0; - xbt_mutex_acquire(receiver_mutex); + receiver_mutex.acquire(); 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()); + receiver_cond.timedwait(receiver_mutex, + deadline - MSG_get_clock()); else - xbt_cond_wait(receiver_cond, receiver_mutex); + receiver_cond.wait(receiver_mutex); } CATCH (e) { if (e.category != timeout_error) @@ -111,7 +97,7 @@ bool communicator::recv(message*& msg, m_host_t& from, double timeout) xbt_ex_free(e); } } - xbt_mutex_release(receiver_mutex); + receiver_mutex.release(); } if (received.empty()) @@ -150,59 +136,63 @@ int communicator::receiver_wrapper(int, char* []) comm->receiver(); XBT_DEBUG("terminate"); - xbt_mutex_acquire(comm->receiver_mutex); + comm->receiver_mutex.acquire(); comm->receiver_thread = NULL; - xbt_cond_signal(comm->receiver_cond); - xbt_mutex_release(comm->receiver_mutex); + comm->receiver_cond.signal(); + comm->receiver_mutex.release(); 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); + receiver_mutex.acquire(); + receiver_cond.signal(); // signal master that we are ready + receiver_mutex.release(); - 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); + receiver_mutex.acquire(); + received.push(ch->task); + receiver_cond.signal(); + receiver_mutex.release(); + 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); }