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

diff --git a/communicator.cpp b/communicator.cpp
index 45b52ef..0c64b5b 100644
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <tr1/functional>
-#include <cstring>
+#include <sstream>
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include "communicator.h"
@@ -11,6 +11,15 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm, simu,
                                 "Messages from asynchronous pipes");
 
+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();
+}
+
 communicator::communicator()
 {
     const char* hostname = MSG_host_get_name(MSG_host_self());
@@ -18,13 +27,13 @@ communicator::communicator()
     ctrl_mbox = hostname;
     ctrl_mbox += "_ctrl";
     ctrl_task = NULL;
-    ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
+    ctrl_comm = NULL;
     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_comm = NULL;
     data_close_is_last = false;
 }
 
@@ -39,14 +48,20 @@ communicator::~communicator()
               (long )sent_comm.size(), ESSE(sent_comm.size()));
 }
 
+void communicator::listen()
+{
+    ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
+    data_comm = MSG_task_irecv(&data_task, get_data_mbox());
+}
+
 void communicator::send(const char* dest, message* msg)
 {
     double msg_size = sizeof *msg;
     if (msg->get_type() == message::LOAD)
         msg_size += msg->get_amount();
     m_task_t task = MSG_task_create("message", 0.0, msg_size, msg);    
-    sent_comm.push_back(MSG_task_isend(task, dest));
-    flush_sent();
+    msg_comm_t comm = MSG_task_isend(task, dest);
+    sent_comm.push_back(comm);
 }
 
 bool communicator::recv(message*& msg, m_host_t& from, bool wait)
@@ -62,8 +77,8 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
             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;
+                ? MSG_task_irecv(&ctrl_task, get_ctrl_mbox())
+                : NULL;
 
         } else if (data_comm && comm_test_n_destroy(data_comm)) {
             msg = (message* )MSG_task_get_data(data_task);
@@ -72,8 +87,8 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
             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;
+                ? MSG_task_irecv(&data_task, get_data_mbox())
+                : NULL;
         }
 
         restart = wait && !msg && (ctrl_comm || data_comm);
@@ -91,18 +106,21 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
     return msg != NULL;
 }
 
-void communicator::wait_for_sent()
+void communicator::flush(bool wait)
 {
-    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();
+    sent_comm.remove_if(comm_test_n_destroy);
+    if (wait && !sent_comm.empty()) {
+        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(comm_push_in_dynar,
+                                         comms, std::tr1::placeholders::_1));
+            MSG_comm_waitany(comms);
+            xbt_dynar_reset(comms);
+            sent_comm.remove_if(comm_test_n_destroy);
+        }
+        xbt_dynar_free(&comms);
     }
-    xbt_dynar_free(&comms);
 }
 
 void communicator::next_close_on_ctrl_is_last()
@@ -115,13 +133,12 @@ void communicator::next_close_on_data_is_last()
     data_close_is_last = true;
 }
 
-int communicator::send_backlog()
+void communicator::comm_push_in_dynar(xbt_dynar_t dynar, msg_comm_t comm)
 {
-    flush_sent();
-    return sent_comm.size();
+    xbt_dynar_push(dynar, &comm);
 }
 
-bool communicator::comm_test_n_destroy(msg_comm_t& comm)
+bool communicator::comm_test_n_destroy(msg_comm_t comm)
 {
     if (MSG_comm_test(comm)) {
         MSG_comm_destroy(comm);
@@ -130,11 +147,6 @@ bool communicator::comm_test_n_destroy(msg_comm_t& comm)
         return false;
 }
 
-void communicator::flush_sent()
-{
-    std::remove_if(sent_comm.begin(), sent_comm.end(), comm_test_n_destroy);
-}
-
 // Local variables:
 // mode: c++
 // End: