X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/f4125505064e3ff346b31ab9e48f894672e5a7a7..fc5dcac1115a7112e7ad9d67ce7fe233790e0887:/communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index da5e2b5..45b52ef 100644
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,49 +1,42 @@
 #include <algorithm>
+#include <tr1/functional>
 #include <cstring>
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include "communicator.h"
 #include "simgrid_features.h"
+#include "misc.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;
-    }
-
-}
-
 communicator::communicator()
 {
     const char* hostname = MSG_host_get_name(MSG_host_self());
+
     ctrl_mbox = hostname;
     ctrl_mbox += "_ctrl";
     ctrl_task = NULL;
     ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
+    ctrl_close_is_last = false;
 
     data_mbox = hostname;
     data_mbox += "_data";
     data_task = NULL;
     data_comm = MSG_task_irecv(&data_task, get_data_mbox());
+    data_close_is_last = false;
 }
 
 communicator::~communicator()
 {
-    // fixme: don't know how to free pending communications
-    // (data_comm, ctrl_comm and sent_comm)
-
-    flush_sent();
+    if (ctrl_comm)
+        WARN0("ctrl_comm is pending!");
+    if (data_comm)
+        WARN0("data_comm is pending!");
     if (!sent_comm.empty())
-        WARN1("Lost %ld send communications!", (long )sent_comm.size());
+        WARN2("lost %ld send communication%s!",
+              (long )sent_comm.size(), ESSE(sent_comm.size()));
 }
 
 void communicator::send(const char* dest, message* msg)
@@ -56,34 +49,87 @@ void communicator::send(const char* dest, message* msg)
     flush_sent();
 }
 
-bool communicator::recv(message*& msg, m_host_t& from)
+bool communicator::recv(message*& msg, m_host_t& from, bool wait)
 {
+    bool restart;
     msg = NULL;
 
-    if (comm_test_n_destroy(ctrl_comm)) {
-        msg = (message* )MSG_task_get_data(ctrl_task);
-        from = MSG_task_get_source(ctrl_task);
-        MSG_task_destroy(ctrl_task);
-        ctrl_task = NULL;
-        ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
-
-    } else if (comm_test_n_destroy(data_comm)) {
-        msg = (message* )MSG_task_get_data(data_task);
-        from = MSG_task_get_source(data_task);
-        MSG_task_destroy(data_task);
-        data_task = NULL;
-        data_comm = MSG_task_irecv(&data_task, get_data_mbox());
-    }
+    do {
+        if (ctrl_comm && comm_test_n_destroy(ctrl_comm)) {
+            msg = (message* )MSG_task_get_data(ctrl_task);
+            from = MSG_task_get_source(ctrl_task);
+            MSG_task_destroy(ctrl_task);
+            ctrl_task = NULL;
+            ctrl_comm =
+                (!ctrl_close_is_last || msg->get_type() != message::CTRL_CLOSE)
+                ? ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox())
+                : ctrl_comm = NULL;
+
+        } else if (data_comm && comm_test_n_destroy(data_comm)) {
+            msg = (message* )MSG_task_get_data(data_task);
+            from = MSG_task_get_source(data_task);
+            MSG_task_destroy(data_task);
+            data_task = NULL;
+            data_comm =
+                (!data_close_is_last || msg->get_type() != message::DATA_CLOSE)
+                ? data_comm = MSG_task_irecv(&data_task, get_data_mbox())
+                : data_comm = NULL;
+        }
+
+        restart = wait && !msg && (ctrl_comm || data_comm);
+        if (restart) {
+            xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+            if (ctrl_comm)
+                xbt_dynar_push(comms, &ctrl_comm);
+            if (data_comm)
+                xbt_dynar_push(comms, &data_comm);
+            MSG_comm_waitany(comms);
+            xbt_dynar_free(&comms);
+        }
+    } while (restart);
 
     return msg != NULL;
 }
 
+void communicator::wait_for_sent()
+{
+    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+    while (!sent_comm.empty()) {
+        std::for_each(sent_comm.begin(), sent_comm.end(),
+                      std::tr1::bind(xbt_dynar_push,
+                                     comms, std::tr1::placeholders::_1));
+        MSG_comm_waitany(comms);
+        xbt_dynar_reset(comms);
+        flush_sent();
+    }
+    xbt_dynar_free(&comms);
+}
+
+void communicator::next_close_on_ctrl_is_last()
+{
+    ctrl_close_is_last = true;
+}
+
+void communicator::next_close_on_data_is_last()
+{
+    data_close_is_last = true;
+}
+
 int communicator::send_backlog()
 {
     flush_sent();
     return sent_comm.size();
 }
 
+bool communicator::comm_test_n_destroy(msg_comm_t& comm)
+{
+    if (MSG_comm_test(comm)) {
+        MSG_comm_destroy(comm);
+        return true;
+    } else
+        return false;
+}
+
 void communicator::flush_sent()
 {
     std::remove_if(sent_comm.begin(), sent_comm.end(), comm_test_n_destroy);