Wip++...

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 93389c756d1253b9ade6e530556a3b3eb0965281..45b52ef73eb1c76bbfecd528bcb89aab8c8a5bc9 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,127 +1,118 @@
 #include <algorithm>
 #include <algorithm>

+#include <tr1/functional>

 #include <cstring>
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include "communicator.h"
 #include "simgrid_features.h"
 #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");
 
 
 // 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;
-    }
-
-}
-
-class communicator::message  {
-public:
-    message(message_type t, double a): type(t), amount(a) { }
-
-    message_type type;
-    double amount;
-};
-

 communicator::communicator()
 {
     const char* hostname = MSG_host_get_name(MSG_host_self());
 communicator::communicator()
 {
     const char* hostname = MSG_host_get_name(MSG_host_self());

-    ctrl_mbox = bprintf("%s_ctrl", hostname);
+
+    ctrl_mbox = hostname;
+    ctrl_mbox += "_ctrl";

     ctrl_task = NULL;
     ctrl_task = NULL;

-    ctrl_comm = MSG_task_irecv(&ctrl_task, ctrl_mbox);
+    ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
+    ctrl_close_is_last = false;

 
 

-    data_mbox = bprintf("%s_data", hostname);
+    data_mbox = hostname;
+    data_mbox += "_data";

     data_task = NULL;
     data_task = NULL;

-    data_comm = MSG_task_irecv(&data_task, data_mbox);
+    data_comm = MSG_task_irecv(&data_task, get_data_mbox());
+    data_close_is_last = false;

 }
 
 communicator::~communicator()
 {
 }
 
 communicator::~communicator()
 {

-    // fixme: don't know how to free pending communications
-    // (data_comm, ctrl_comm and sent_comm)
-
-    free(data_mbox);
-    free(ctrl_mbox);
-
-    flush_sent();
+    if (ctrl_comm)
+        WARN0("ctrl_comm is pending!");
+    if (data_comm)
+        WARN0("data_comm is pending!");

     if (!sent_comm.empty())
     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_info(const neighbor& dest, double amount)
+void communicator::send(const char* dest, message* msg)

 {
 {

-    message* msg = new message(INFO_MSG, amount);
-    m_task_t task = MSG_task_create("load msg", 0.0, sizeof *msg, msg);
-    send(dest.get_ctrl_mbox(), task);
+    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();

 }
 
 }
 

-void communicator::send_credit(const neighbor& dest, double amount)
+bool communicator::recv(message*& msg, m_host_t& from, bool wait)

 {
 {

-    message* msg = new message(CREDIT_MSG, amount);
-    m_task_t task = MSG_task_create("credit msg", 0.0, sizeof *msg, msg);
-    send(dest.get_ctrl_mbox(), task);
-}
+    bool restart;
+    msg = NULL;

 
 

-void communicator::send_load(const neighbor& dest, double amount)
-{
-    m_task_t task = MSG_task_create("data msg", 0.0, amount, NULL);
-    send(dest.get_data_mbox(), task);
-}
+    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;
+        }

 
 

-void communicator::send(const char* dest, m_task_t task)
-{
-    sent_comm.push_back(MSG_task_isend(task, dest));
-    flush_sent();
-}
+        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);

 
 

-bool communicator::recv_info(double& amount, m_host_t& from)
-{
-    return recv_ctrl(INFO_MSG, amount, from);
+    return msg != NULL;

 }
 
 }
 

-bool communicator::recv_credit(double& amount, m_host_t& from)
+void communicator::wait_for_sent()

 {
 {

-    return recv_ctrl(CREDIT_MSG, amount, from);
+    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);

 }
 
 }
 

-bool communicator::recv_load(double& amount, m_host_t& from)
+void communicator::next_close_on_ctrl_is_last()

 {
 {

-    bool res = comm_test_n_destroy(data_comm);
-    if (res) {
-        amount = MSG_task_get_data_size(data_task);
-        from = MSG_task_get_source(data_task);
-        MSG_task_destroy(data_task);
-        data_task = NULL;
-        data_comm = MSG_task_irecv(&data_task, data_mbox);
-    }
-    return res;
+    ctrl_close_is_last = true;

 }
 
 }
 

-bool communicator::recv_ctrl(message_type type, double& amount, m_host_t& from)
+void communicator::next_close_on_data_is_last()

 {
 {

-    bool res = MSG_comm_test(ctrl_comm);
-    if (res) {
-        message* msg = (message* )MSG_task_get_data(ctrl_task);
-        if (msg->type == type) {
-            MSG_comm_destroy(ctrl_comm);
-            amount = msg->amount;
-            from = MSG_task_get_source(ctrl_task);
-            delete msg;
-            MSG_task_destroy(ctrl_task);
-            ctrl_task = NULL;
-            ctrl_comm = MSG_task_irecv(&ctrl_task, ctrl_mbox);
-        } else {
-            res = false;
-        }
-    }
-    return res;
+    data_close_is_last = true;

 }
 
 int communicator::send_backlog()
 }
 
 int communicator::send_backlog()


@@ -130,6 +121,15 @@ int communicator::send_backlog()
     return sent_comm.size();
 }
 
     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);
 void communicator::flush_sent()
 {
     std::remove_if(sent_comm.begin(), sent_comm.end(), comm_test_n_destroy);