API change in SimGrid 3.8: MSG_global_init -> MSG_init.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 96cd598fbaf807574f8870952a9e05c352f1784f..2ba91a01583ff498df543e571ec46f568b221cce 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,40 +1,31 @@
 #include <algorithm>
 #include <algorithm>

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

 #include <msg/msg.h>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"
 #include <msg/msg.h>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"

-#include "options.h"
-#include "simgrid_features.h"

 #include "tracing.h"
 
 #include "communicator.h"
 
 #include "tracing.h"
 
 #include "communicator.h"
 

-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();
+namespace {
+
+    void check_for_lost_messages(size_t size, const char* descr)
+    {
+        if (size)
+            XBT_WARN("lost %zu %s message%s!", size, descr, ESSE(size));
+    }
+

 }
 
 communicator::communicator()
     : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))
 }
 
 communicator::communicator()
     : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))

-    , receiver_mutex(xbt_mutex_init())
-    , receiver_cond(xbt_cond_init())

 {
 {

-    xbt_mutex_acquire(receiver_mutex);
-    receiver_thread =
-        MSG_process_create("receiver", communicator::receiver_wrapper,
-                           this, MSG_host_self());
-    // wait for the receiver to be ready
-    xbt_cond_wait(receiver_cond, receiver_mutex);
-    xbt_mutex_release(receiver_mutex);
+    receiver_thread = new_msg_thread("receiver",
+                                     std::bind(&communicator::receiver, this));
+    receiver_thread->start();

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


@@ -49,107 +40,42 @@ communicator::~communicator()
     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, host->get_data_mbox());
 
     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, host->get_data_mbox());
 

-    xbt_mutex_acquire(receiver_mutex);
-    while (receiver_thread) {
-        XBT_DEBUG("waiting for receiver to terminate");
-        xbt_cond_wait(receiver_cond, receiver_mutex);
-    }
-    xbt_mutex_release(receiver_mutex);
-
-    if (!received.empty())
-        XBT_WARN("lost %zu received message%s!",
-                 received.size(), ESSE(received.size()));
-    if (!sent_comm.empty())
-        XBT_WARN("lost %zu sent message%s!",
-                 sent_comm.size(), ESSE(sent_comm.size()));
+    receiver_thread->wait();
+    delete receiver_thread;

 
 

-    xbt_cond_destroy(receiver_cond);
-    xbt_mutex_destroy(receiver_mutex);
+    check_for_lost_messages(ctrl_received.size(), "received ctrl");
+    check_for_lost_messages(data_received.size(), "received data");
+    check_for_lost_messages(ctrl_sent.size(), "sent ctrl");
+    check_for_lost_messages(data_sent.size(), "sent data");

 }
 
 }
 

-void communicator::send(const char* dest, message* msg)
+msg_comm_t communicator::real_send(const char* dest, message* msg)

 {
     XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest);
 {
     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);
-}
-
-bool communicator::recv(message*& msg, m_host_t& from, double timeout)
-{
-    if (timeout != 0) {
-        volatile double deadline =
-            timeout > 0 ? MSG_get_clock() + timeout : 0.0;
-        xbt_mutex_acquire(receiver_mutex);
-        while (received.empty() && (!deadline || deadline > MSG_get_clock())) {
-            xbt_ex_t e;
-            XBT_DEBUG("waiting for a message to come");
-            TRY {
-                if (deadline)
-                    xbt_cond_timedwait(receiver_cond, receiver_mutex,
-                                       deadline - MSG_get_clock());
-                else
-                    xbt_cond_wait(receiver_cond, receiver_mutex);
-            }
-            CATCH (e) {
-                if (e.category != timeout_error)
-                    RETHROW;
-                xbt_ex_free(e);
-            }
-        }
-        xbt_mutex_release(receiver_mutex);
-    }
-
-    if (received.empty())
-        return false;
-
-    m_task_t task = received.front();
-    received.pop();
-    msg = static_cast<message*>(MSG_task_get_data(task));
-    from = MSG_task_get_source(task);
-    MSG_task_destroy(task);
-
-    XBT_DEBUG("received %s from %s",
-           msg->to_string().c_str(), MSG_host_get_name(from));
-
-    return true;
+    m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg);
+    // MSG_task_set_category(task,
+    //                       msg->get_type() == message::DATA ?
+    //                       TRACE_CAT_DATA : TRACE_CAT_CTRL);
+    return MSG_task_isend(task, dest);

 }
 
 }
 

-void communicator::flush(bool wait)
+void communicator::real_flush(sent_comm_type& sent_comm, bool wait)

 {
 {

-    sent_comm.remove_if(comm_test_n_destroy);
+    sent_comm_type::iterator 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()) {
     if (wait && !sent_comm.empty()) {

-        msg_comm_t comms[sent_comm.size()];
+        size_t size = sent_comm.size();
+        msg_comm_t* comms = new msg_comm_t[size];

         std::copy(sent_comm.begin(), sent_comm.end(), comms);
         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();
         sent_comm.clear();

+        MSG_comm_waitall(comms, size, -1.0);
+        std::for_each(comms, comms + size, comm_check_n_destroy);
+        delete[] comms;

     }
 }
 
     }
 }
 

-int communicator::receiver_wrapper(int, char* [])
-{
-    communicator* comm;
-    comm = static_cast<communicator*>(MSG_process_get_data(MSG_process_self()));
-    comm->receiver();
-
-    XBT_DEBUG("terminate");
-    xbt_mutex_acquire(comm->receiver_mutex);
-    comm->receiver_thread = NULL;
-    xbt_cond_signal(comm->receiver_cond);
-    xbt_mutex_release(comm->receiver_mutex);
-
-    return 0;
-}
-

 void communicator::receiver()
 {
     xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
 void communicator::receiver()
 {
     xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);


@@ -157,9 +83,10 @@ void communicator::receiver()
         msg_comm_t comm;
         m_task_t task;
         const char* mbox;
         msg_comm_t comm;
         m_task_t task;
         const char* mbox;

+        message_queue& received;

     };
     };

-    channel chan[] = { { NULL, NULL, host->get_ctrl_mbox() },
-                       { NULL, NULL, host->get_data_mbox() } };
+    channel chan[] = { { NULL, NULL, host->get_ctrl_mbox(), ctrl_received },
+                       { NULL, NULL, host->get_data_mbox(), data_received } };

     const int chan_size = (sizeof chan) / (sizeof chan[0]);
 
     for (int i = 0 ; i < chan_size ; ++i) {
     const int chan_size = (sizeof chan) / (sizeof chan[0]);
 
     for (int i = 0 ; i < chan_size ; ++i) {


@@ -167,11 +94,6 @@ void communicator::receiver()
         xbt_dynar_push(comms, &chan[i].comm);
     }
 
         xbt_dynar_push(comms, &chan[i].comm);
     }
 

-    XBT_DEBUG("receiver ready");
-    xbt_mutex_acquire(receiver_mutex);
-    xbt_cond_signal(receiver_cond); // signal master that we are ready
-    xbt_mutex_release(receiver_mutex);
-

     while (!xbt_dynar_is_empty(comms)) {
 
         int index = MSG_comm_waitany(comms);
     while (!xbt_dynar_is_empty(comms)) {
 
         int index = MSG_comm_waitany(comms);


@@ -184,10 +106,7 @@ void communicator::receiver()
         comm_check_n_destroy(ch->comm);
         if (strcmp(MSG_task_get_name(ch->task), "finalize")) {
             XBT_DEBUG("received message on %s", ch->mbox);
         comm_check_n_destroy(ch->comm);
         if (strcmp(MSG_task_get_name(ch->task), "finalize")) {
             XBT_DEBUG("received message on %s", ch->mbox);

-            xbt_mutex_acquire(receiver_mutex);
-            received.push(ch->task);
-            xbt_cond_signal(receiver_cond);
-            xbt_mutex_release(receiver_mutex);
+            ch->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);
             ch->task = NULL;
             ch->comm = MSG_task_irecv(&ch->task, ch->mbox);
             xbt_dynar_set_as(comms, index, msg_comm_t, ch->comm);