xbt_cond_timedwait: mutex is not held on timeout.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 2ddea5d65c0fdb16b1ec1849ce320681e8d5f2d5..5abb543582c617a948258fc16845abafbf56cfaa 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -6,7 +6,6 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"

-#include "simgrid_features.h"

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


@@ -31,7 +30,7 @@ communicator::communicator()
 
 communicator::~communicator()
 {
 
 communicator::~communicator()
 {

-    m_task_t task;
+    msg_task_t task;

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


@@ -53,10 +52,10 @@ communicator::~communicator()
 msg_comm_t communicator::real_send(const char* dest, message* msg)
 {
     XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest);
 msg_comm_t communicator::real_send(const char* dest, message* msg)
 {
     XBT_DEBUG("send %s to %s", msg->to_string().c_str(), dest);

-    m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg);
-    TRACE_msg_set_task_category(task,
-                                msg->get_type() == message::DATA ?
-                                TRACE_CAT_DATA : TRACE_CAT_CTRL);
+    msg_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);
 }
 
     return MSG_task_isend(task, dest);
 }
 


@@ -82,7 +81,7 @@ void communicator::receiver()
     xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
     struct channel {
         msg_comm_t comm;
     xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
     struct channel {
         msg_comm_t comm;

-        m_task_t task;
+        msg_task_t task;

         const char* mbox;
         message_queue& received;
     };
         const char* mbox;
         message_queue& received;
     };