Deadlock fix, and other changes.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index b78b1c3a97bdda6d6ddba7524b23d433d5c4bbe1..1570b10148a02dbb2fdfa7a78444d2cae1309b6a 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,74 +1,155 @@
 #include <algorithm>
 #include <algorithm>

-#include <cstring>
+#include <tr1/functional>
+#include <sstream>

 #include <msg/msg.h>
 #include <xbt/log.h>
 #include <msg/msg.h>
 #include <xbt/log.h>

+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
+
+#include "misc.h"
+#include "options.h"
+

 #include "communicator.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;
-    }
+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();

 }
 
 }
 

+const int communicator::send_count_before_flush = 4;
+

 communicator::communicator()
 communicator::communicator()

+    : host((hostdata* )MSG_host_get_data(MSG_host_self()))
+    , send_counter(0)
+    , ctrl_task(NULL)
+    , ctrl_comm(NULL)
+    , ctrl_close_is_last(false)
+    , data_task(NULL)
+    , data_comm(NULL)
+    , data_close_is_last(false)

 {
 {

-    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);

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

-    send_acknowledge();
+    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());
-    delete[] recv_mbox;
+        WARN2("lost %ld send communication%s!",
+              (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(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();
+    DEBUG2("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);    
+    msg_comm_t comm = MSG_task_isend(task, dest);
+    sent_comm.push_back(comm);
+
+    if (++send_counter >= send_count_before_flush) {
+        flush(false);
+        send_counter = 0;
+    }

 }
 
 }
 

-void communicator::send(m_task_t task, const std::string& dest)
+bool communicator::recv(message*& msg, m_host_t& from, bool wait)

 {
 {

-    send(task, dest.c_str());
+    bool restart;
+    msg = NULL;
+
+    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)
+                ? 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);
+            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)
+                ? MSG_task_irecv(&data_task, get_data_mbox())
+                : 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);
+
+    if (msg)
+        DEBUG2("received %s from %s",
+               msg->to_string().c_str(), MSG_host_get_name(from));
+
+    return msg != NULL;

 }
 
 }
 

-m_task_t communicator::recv()
-{ 
-   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);
+void communicator::flush(bool wait)
+{
+    using namespace std::tr1;
+    using namespace std::tr1::placeholders;
+
+    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(),
+                          bind(xbt_dynar_push,
+                               comms, bind(misc::address<msg_comm_t>(), _1)));
+            MSG_comm_waitany(comms);
+            xbt_dynar_reset(comms);
+            sent_comm.remove_if(comm_test_n_destroy);
+        }
+        xbt_dynar_free(&comms);

     }
     }

-    return task;

 }
 
 }
 

-int communicator::sent_count()
+void communicator::next_close_on_ctrl_is_last()
+{
+    ctrl_close_is_last = true;
+}
+
+void communicator::next_close_on_data_is_last()

 {
 {

-    send_acknowledge();
-    return sent_comm.size();
+    data_close_is_last = true;

 }
 
 }
 

-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)) {
+        MSG_comm_destroy(comm);
+        return true;
+    } else
+        return false;

 }
 
 // Local variables:
 }
 
 // Local variables: