Filx build with SimGrid 3.14.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index e6a47b4a81e3d7e7ec9662e753982931fb5674e2..2df6d76d9a04531e725aa1f9fb5fce8c538b95a1 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,12 +1,10 @@
 #include <algorithm>
-#include <functional>
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"
-#include "simgrid_features.h"
 #include "tracing.h"
 
 #include "communicator.h"
@@ -24,14 +22,13 @@ namespace {
 communicator::communicator()
     : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))
 {
-    receiver_thread = new_msg_thread("receiver",
-                                     std::bind(&communicator::receiver, this));
+    receiver_thread = new_msg_thread("receiver", [this]() { this->receiver(); });
     receiver_thread->start();
 }
 
 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);
@@ -53,10 +50,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);
-    m_task_t task = MSG_task_create("message", 0.0, msg->get_size(), msg);
-    TRACE_msg_set_task_category(task,
-                                msg->get_type() == message::LOAD ?
-                                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);
 }
 
@@ -82,7 +79,7 @@ void communicator::receiver()
     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;
     };