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

diff --git a/communicator.cpp b/communicator.cpp
index 96cd598..ce0e79f 100644
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,7 +1,5 @@
 #include <algorithm>
-#include <cstring>
 #include <tr1/functional>
-#include <sstream>
 #include <msg/msg.h>
 #include <xbt/log.h>
 
@@ -14,27 +12,13 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #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())))
-    , 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);
+    using std::tr1::bind;
+    receiver_thread = new_msg_thread("receiver",
+                                     bind(&communicator::receiver, this));
+    receiver_thread->start();
 }
 
 communicator::~communicator()
@@ -49,12 +33,8 @@ communicator::~communicator()
     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);
+    receiver_thread->wait();
+    delete receiver_thread;
 
     if (!received.empty())
         XBT_WARN("lost %zu received message%s!",
@@ -62,9 +42,6 @@ communicator::~communicator()
     if (!sent_comm.empty())
         XBT_WARN("lost %zu sent message%s!",
                  sent_comm.size(), ESSE(sent_comm.size()));
-
-    xbt_cond_destroy(receiver_cond);
-    xbt_mutex_destroy(receiver_mutex);
 }
 
 void communicator::send(const char* dest, message* msg)
@@ -81,49 +58,12 @@ void communicator::send(const char* dest, message* msg)
     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;
-}
-
 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);
@@ -135,19 +75,14 @@ void communicator::flush(bool wait)
     }
 }
 
-int communicator::receiver_wrapper(int, char* [])
+bool communicator::recv(message*& msg, m_host_t& from, double timeout)
 {
-    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;
+    XBT_DEBUG("waiting for a message to come");
+    bool recvd = received.pop(msg, from, timeout);
+    if (recvd)
+        XBT_DEBUG("received %s from %s",
+                  msg->to_string().c_str(), MSG_host_get_name(from));
+    return recvd;
 }
 
 void communicator::receiver()
@@ -167,11 +102,6 @@ void communicator::receiver()
         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);
@@ -184,10 +114,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);
-            xbt_mutex_acquire(receiver_mutex);
             received.push(ch->task);
-            xbt_cond_signal(receiver_cond);
-            xbt_mutex_release(receiver_mutex);
             ch->task = NULL;
             ch->comm = MSG_task_irecv(&ch->task, ch->mbox);
             xbt_dynar_set_as(comms, index, msg_comm_t, ch->comm);