X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/f2850cc1d935992994177c2c266141d5304d4694..892e36c1af3105e5f548a4ef8b9f777b95d47fc2:/communicator.cpp?ds=sidebyside

diff --git a/communicator.cpp b/communicator.cpp
index 96cd598..3516b68 100644
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,7 +1,4 @@
 #include <algorithm>
-#include <cstring>
-#include <tr1/functional>
-#include <sstream>
 #include <msg/msg.h>
 #include <xbt/log.h>
 
@@ -14,27 +11,15 @@ 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_mutex.acquire();
     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_cond.wait(receiver_mutex); // wait for the receiver to be ready
+    receiver_mutex.release();
 }
 
 communicator::~communicator()
@@ -49,12 +34,12 @@ communicator::~communicator()
     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, host->get_data_mbox());
 
-    xbt_mutex_acquire(receiver_mutex);
+    receiver_mutex.acquire();
     while (receiver_thread) {
         XBT_DEBUG("waiting for receiver to terminate");
-        xbt_cond_wait(receiver_cond, receiver_mutex);
+        receiver_cond.wait(receiver_mutex);
     }
-    xbt_mutex_release(receiver_mutex);
+    receiver_mutex.release();
 
     if (!received.empty())
         XBT_WARN("lost %zu received message%s!",
@@ -62,9 +47,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,46 +63,6 @@ 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);
@@ -135,6 +77,16 @@ void communicator::flush(bool wait)
     }
 }
 
+bool communicator::recv(message*& msg, m_host_t& from, double timeout)
+{
+    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;
+}
+
 int communicator::receiver_wrapper(int, char* [])
 {
     communicator* comm;
@@ -142,10 +94,10 @@ int communicator::receiver_wrapper(int, char* [])
     comm->receiver();
 
     XBT_DEBUG("terminate");
-    xbt_mutex_acquire(comm->receiver_mutex);
+    comm->receiver_mutex.acquire();
     comm->receiver_thread = NULL;
-    xbt_cond_signal(comm->receiver_cond);
-    xbt_mutex_release(comm->receiver_mutex);
+    comm->receiver_cond.signal();
+    comm->receiver_mutex.release();
 
     return 0;
 }
@@ -168,9 +120,9 @@ void communicator::receiver()
     }
 
     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);
+    receiver_mutex.acquire();
+    receiver_cond.signal();     // signal master that we are ready
+    receiver_mutex.release();
 
     while (!xbt_dynar_is_empty(comms)) {
 
@@ -184,10 +136,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);