Make communicator::recv() inline.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 080842619541038f29bba85cfc051a28a8a531d5..fd01ac91b585074fa2b891daaf3dec8f0ac8deb6 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,7 +1,5 @@
 #include <algorithm>
 #include <algorithm>

-#include <cstring>

 #include <tr1/functional>
 #include <tr1/functional>

-#include <sstream>

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


@@ -14,30 +12,13 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "communicator.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();
-}
-

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

-    , mutex(xbt_mutex_init())
-    , cond(xbt_cond_init())
-    , ctrl_task(NULL)
-    , ctrl_comm(NULL)
-    , data_task(NULL)
-    , data_comm(NULL)

 {
 {

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

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


@@ -46,32 +27,21 @@ communicator::~communicator()
 
     XBT_DEBUG("send finalize to receiver/ctrl");
     task = MSG_task_create("finalize", 0.0, 0, NULL);
 
     XBT_DEBUG("send finalize to receiver/ctrl");
     task = MSG_task_create("finalize", 0.0, 0, NULL);

-    MSG_task_send(task, get_ctrl_mbox());
+    MSG_task_send(task, host->get_ctrl_mbox());

 
     XBT_DEBUG("send finalize to receiver/data");
     task = MSG_task_create("finalize", 0.0, 0, NULL);
 
     XBT_DEBUG("send finalize to receiver/data");
     task = MSG_task_create("finalize", 0.0, 0, NULL);

-    MSG_task_send(task, get_data_mbox());
+    MSG_task_send(task, host->get_data_mbox());

 
 

-    xbt_mutex_acquire(mutex);
-    while (receiver_process) {
-        XBT_DEBUG("waiting for receiver to terminate");
-        xbt_cond_wait(cond, mutex);
-    }
-    xbt_mutex_release(mutex);
+    receiver_thread->wait();
+    delete receiver_thread;

 
 

-    if (ctrl_comm)
-        XBT_WARN("ctrl_comm is pending!");
-    if (data_comm)
-        XBT_WARN("data_comm is pending!");

     if (!received.empty())
     if (!received.empty())

-        XBT_WARN("lost %lu received message%s!",
-                 (unsigned long )received.size(), ESSE(received.size()));
+        XBT_WARN("lost %zu received message%s!",
+                 received.size(), ESSE(received.size()));

     if (!sent_comm.empty())
     if (!sent_comm.empty())

-        XBT_WARN("lost %lu sent message%s!",
-                 (unsigned long )sent_comm.size(), ESSE(sent_comm.size()));
-
-    xbt_cond_destroy(cond);
-    xbt_mutex_destroy(mutex);
+        XBT_WARN("lost %zu sent message%s!",
+                 sent_comm.size(), ESSE(sent_comm.size()));

 }
 
 void communicator::send(const char* dest, message* msg)
 }
 
 void communicator::send(const char* dest, message* msg)


@@ -88,139 +58,81 @@ void communicator::send(const char* dest, message* msg)
     sent_comm.push_back(comm);
 }
 
     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(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(cond, mutex, deadline - MSG_get_clock());
-                else
-                    xbt_cond_wait(cond, mutex);
-            }
-            CATCH (e) {
-                if (e.category != timeout_error)
-                    RETHROW;
-                xbt_ex_free(e);
-            }
-        }
-        xbt_mutex_release(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;
-}
-

 void communicator::flush(bool wait)
 {
 void communicator::flush(bool wait)
 {

-    sent_comm.remove_if(comm_test_n_destroy);
+    sent_comm_type::iterator bound;
+    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()) {
         msg_comm_t comms[sent_comm.size()];
         std::copy(sent_comm.begin(), sent_comm.end(), comms);
         MSG_comm_waitall(comms, sent_comm.size(), -1.0);
         if (!MSG_WAIT_DESTROYS_COMMS)
     if (wait && !sent_comm.empty()) {
         msg_comm_t comms[sent_comm.size()];
         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(), MSG_comm_destroy);
+            std::for_each(sent_comm.begin(), sent_comm.end(),
+                          comm_check_n_destroy);

         sent_comm.clear();
     }
 }
 
         sent_comm.clear();
     }
 }
 

-bool communicator::comm_test_n_destroy(msg_comm_t comm)
+void communicator::receiver()

 {
 {

-    if (MSG_comm_test(comm)) {
-        MSG_comm_destroy(comm);
-        return true;
-    } else
-        return false;
-}
-
-int communicator::receiver_wrapper(int, char* [])
-{
-    communicator* comm;
-    comm = static_cast<communicator*>(MSG_process_get_data(MSG_process_self()));
-    int result = comm->receiver();
+    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+    struct channel {
+        msg_comm_t comm;
+        m_task_t task;
+        const char* mbox;
+    };
+    channel chan[] = { { NULL, NULL, host->get_ctrl_mbox() },
+                       { NULL, NULL, host->get_data_mbox() } };
+    const int chan_size = (sizeof chan) / (sizeof chan[0]);
+
+    for (int i = 0 ; i < chan_size ; ++i) {
+        chan[i].comm = MSG_task_irecv(&chan[i].task, chan[i].mbox);
+        xbt_dynar_push(comms, &chan[i].comm);
+    }

 
 

-    XBT_DEBUG("terminate");
-    xbt_mutex_acquire(comm->mutex);
-    comm->receiver_process = NULL;
-    xbt_cond_signal(comm->cond);
-    xbt_mutex_release(comm->mutex);
+    while (!xbt_dynar_is_empty(comms)) {
+
+        int index = MSG_comm_waitany(comms);
+        msg_comm_t finished_comm = xbt_dynar_get_as(comms, index, msg_comm_t);
+        channel* ch;
+
+        for (ch = chan ; ch->comm != finished_comm ; ++ch)
+            /* nop */;
+
+        comm_check_n_destroy(ch->comm);
+        if (strcmp(MSG_task_get_name(ch->task), "finalize")) {
+            XBT_DEBUG("received message on %s", ch->mbox);
+            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);
+        } else {
+            XBT_DEBUG("received finalize on %s", ch->mbox);
+            MSG_task_destroy(ch->task);
+            ch->task = NULL;
+            ch->comm = NULL;
+            xbt_dynar_remove_at(comms, index, NULL);
+        }

 
 

-    return result;
+    }
+    xbt_dynar_free(&comms);

 }
 
 }
 

-int communicator::receiver()
+void communicator::comm_check_n_destroy(msg_comm_t comm)

 {
 {

-    ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
-    data_comm = MSG_task_irecv(&data_task, get_data_mbox());
-    XBT_DEBUG("receiver ready");
-    xbt_mutex_acquire(mutex);
-    xbt_cond_signal(cond);      // signal master that we are ready
-    xbt_mutex_release(mutex);
-
-    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
-    while (ctrl_comm || data_comm) {
-
-        if (ctrl_comm)
-            xbt_dynar_push(comms, &ctrl_comm);
-        if (data_comm)
-            xbt_dynar_push(comms, &data_comm);
-        MSG_comm_waitany(comms);
-        xbt_dynar_reset(comms);
-
-        if (ctrl_comm && comm_test_n_destroy(ctrl_comm)) {
-            if (strcmp(MSG_task_get_name(ctrl_task), "finalize")) {
-                XBT_DEBUG("received message from ctrl");
-                xbt_mutex_acquire(mutex);
-                received.push(ctrl_task);
-                xbt_mutex_release(mutex);
-                ctrl_task = NULL;
-                ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
-            } else {
-                XBT_DEBUG("received finalize from ctrl");
-                MSG_task_destroy(ctrl_task);
-                ctrl_task = NULL;
-                ctrl_comm = NULL;
-            }
-        }
+    xbt_assert(MSG_comm_get_status(comm) == MSG_OK);
+    MSG_comm_destroy(comm);
+}

 
 

-        if (data_comm && comm_test_n_destroy(data_comm)) {
-            if (strcmp(MSG_task_get_name(data_task), "finalize")) {
-                XBT_DEBUG("received message from data");
-                xbt_mutex_acquire(mutex);
-                received.push(data_task);
-                xbt_mutex_release(mutex);
-                data_task = NULL;
-                data_comm = MSG_task_irecv(&data_task, get_data_mbox());
-            } else {
-                XBT_DEBUG("received finalize from data");
-                MSG_task_destroy(data_task);
-                data_task = NULL;
-                data_comm = NULL;
-            }
-        }
-        xbt_mutex_acquire(mutex);
-        if (!received.empty())
-            xbt_cond_signal(cond);
-        xbt_mutex_release(mutex);
-    }
-    xbt_dynar_free(&comms);
-    return 0;
+bool communicator::comm_test_n_destroy(msg_comm_t comm)
+{
+    if (MSG_comm_test(comm)) {
+        comm_check_n_destroy(comm);
+        return true;
+    } else
+        return false;

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