Replace NULL with nullptr.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index e6a47b4a81e3d7e7ec9662e753982931fb5674e2..bb48bd777bb2b217fe700ccbf7b6569a1a5fa311 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,12 +1,10 @@
 #include <algorithm>
 #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 <xbt/log.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"


@@ -24,21 +22,20 @@ namespace {
 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())))
 {

-    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()
 {
     receiver_thread->start();
 }
 
 communicator::~communicator()
 {

-    m_task_t task;
+    msg_task_t task;

 
     XBT_DEBUG("send finalize to receiver/ctrl");
 
     XBT_DEBUG("send finalize to receiver/ctrl");

-    task = MSG_task_create("finalize", 0.0, 0, NULL);
+    task = MSG_task_create("finalize", 0.0, 0, nullptr);

     MSG_task_send(task, host->get_ctrl_mbox());
 
     XBT_DEBUG("send finalize to receiver/data");
     MSG_task_send(task, host->get_ctrl_mbox());
 
     XBT_DEBUG("send finalize to receiver/data");

-    task = MSG_task_create("finalize", 0.0, 0, NULL);
+    task = MSG_task_create("finalize", 0.0, 0, nullptr);

     MSG_task_send(task, host->get_data_mbox());
 
     receiver_thread->wait();
     MSG_task_send(task, host->get_data_mbox());
 
     receiver_thread->wait();


@@ -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);
 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);
 }
 
     return MSG_task_isend(task, dest);
 }
 


@@ -79,15 +76,15 @@ void communicator::real_flush(sent_comm_type& sent_comm, bool wait)
 
 void communicator::receiver()
 {
 
 void communicator::receiver()
 {

-    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), nullptr);

     struct channel {
         msg_comm_t comm;
     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;
     };

-    channel chan[] = { { NULL, NULL, host->get_ctrl_mbox(), ctrl_received },
-                       { NULL, NULL, host->get_data_mbox(), data_received } };
+    channel chan[] = { { nullptr, nullptr, host->get_ctrl_mbox(), ctrl_received },
+                       { nullptr, nullptr, host->get_data_mbox(), data_received } };

     const int chan_size = (sizeof chan) / (sizeof chan[0]);
 
     for (int i = 0 ; i < chan_size ; ++i) {
     const int chan_size = (sizeof chan) / (sizeof chan[0]);
 
     for (int i = 0 ; i < chan_size ; ++i) {


@@ -108,15 +105,15 @@ void communicator::receiver()
         if (strcmp(MSG_task_get_name(ch->task), "finalize")) {
             XBT_DEBUG("received message on %s", ch->mbox);
             ch->received.push(ch->task);
         if (strcmp(MSG_task_get_name(ch->task), "finalize")) {
             XBT_DEBUG("received message on %s", ch->mbox);
             ch->received.push(ch->task);

-            ch->task = NULL;
+            ch->task = nullptr;

             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->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);
+            ch->task = nullptr;
+            ch->comm = nullptr;
+            xbt_dynar_remove_at(comms, index, nullptr);

         }
 
     }
         }
 
     }