X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/147d0e88c4da14c801d15e0875bedb474180bea2..0e9987fcef822119e3218d14328eb39977525662:/communicator.cpp?ds=sidebyside

diff --git a/communicator.cpp b/communicator.cpp
index 0d724aa..fd01ac9 100644
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,74 +1,138 @@
 #include <algorithm>
-#include <cstring>
+#include <tr1/functional>
 #include <msg/msg.h>
 #include <xbt/log.h>
-#include "communicator.h"
 
-// XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm, simu,
-                                "Messages from asynchronous pipes");
-
-namespace {
-    bool comm_test_n_destroy(msg_comm_t& comm)
-    {
-        if (MSG_comm_test(comm)) {
-            MSG_comm_destroy(comm);
-            return true;
-        } else
-            return false;
-    }
-}
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
+
+#include "misc.h"
+#include "options.h"
+#include "simgrid_features.h"
+#include "tracing.h"
+
+#include "communicator.h"
 
 communicator::communicator()
+    : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))
 {
-    const char* hostname = MSG_host_get_name(MSG_host_self());
-    size_t len = std::strlen(hostname);
-    recv_mbox = new char[len + 1];
-    strcpy(recv_mbox, hostname);
-    recv_task = NULL;
-    recv_comm = MSG_task_irecv(&recv_task, recv_mbox);
+    using std::tr1::bind;
+    receiver_thread = new_msg_thread("receiver",
+                                     bind(&communicator::receiver, this));
+    receiver_thread->start();
 }
 
 communicator::~communicator()
 {
-    send_acknowledge();
+    m_task_t task;
+
+    XBT_DEBUG("send finalize to receiver/ctrl");
+    task = MSG_task_create("finalize", 0.0, 0, NULL);
+    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, host->get_data_mbox());
+
+    receiver_thread->wait();
+    delete receiver_thread;
+
+    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());
-    delete[] recv_mbox;
+        XBT_WARN("lost %zu sent message%s!",
+                 sent_comm.size(), ESSE(sent_comm.size()));
 }
 
-
-void communicator::send(m_task_t task, const char *dest)
+void communicator::send(const char* dest, message* msg)
 {
-    sent_comm.push_back(MSG_task_isend(task, dest));
-    send_acknowledge();
+    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(m_task_t task, const std::string& dest)
+void communicator::flush(bool wait)
 {
-    send(task, dest.c_str());
+    sent_comm_type::iterator bound;
+    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()];
+        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();
+    }
 }
 
-m_task_t communicator::recv()
+void communicator::receiver()
 {
-   m_task_t task = NULL;
-   if (comm_test_n_destroy(recv_comm)) {
-        task = recv_task;
-        recv_task = NULL;
-        recv_comm = MSG_task_irecv(&recv_task, recv_mbox);
+    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);
+    }
+
+    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);
+            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);
+        }
+
     }
-    return task;
+    xbt_dynar_free(&comms);
 }
 
-int communicator::sent_count()
+void communicator::comm_check_n_destroy(msg_comm_t comm)
 {
-    send_acknowledge();
-    return sent_comm.size();
+    xbt_assert(MSG_comm_get_status(comm) == MSG_OK);
+    MSG_comm_destroy(comm);
 }
 
-void communicator::send_acknowledge()
+bool communicator::comm_test_n_destroy(msg_comm_t comm)
 {
-    std::remove_if(sent_comm.begin(), sent_comm.end(), comm_test_n_destroy);
+    if (MSG_comm_test(comm)) {
+        comm_check_n_destroy(comm);
+        return true;
+    } else
+        return false;
 }
 
 // Local variables: