Factorize computation of load_to_send.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index bd0cb7b7a6ba0db14dd2a5741ad53994ae7a5f3e..2ddea5d65c0fdb16b1ec1849ce320681e8d5f2d5 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <tr1/functional>
+#include <functional>
 #include <msg/msg.h>
 #include <xbt/log.h>
 
@@ -24,9 +24,8 @@ namespace {
 communicator::communicator()
     : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))
 {
-    using std::tr1::bind;
     receiver_thread = new_msg_thread("receiver",
-                                     bind(&communicator::receiver, this));
+                                     std::bind(&communicator::receiver, this));
     receiver_thread->start();
 }
 
@@ -56,7 +55,7 @@ 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 ?
+                                msg->get_type() == message::DATA ?
                                 TRACE_CAT_DATA : TRACE_CAT_CTRL);
     return MSG_task_isend(task, dest);
 }
@@ -73,8 +72,7 @@ void communicator::real_flush(sent_comm_type& sent_comm, bool wait)
         std::copy(sent_comm.begin(), sent_comm.end(), comms);
         sent_comm.clear();
         MSG_comm_waitall(comms, size, -1.0);
-        if (!MSG_WAIT_DESTROYS_COMMS)
-            std::for_each(comms, comms + size, comm_check_n_destroy);
+        std::for_each(comms, comms + size, comm_check_n_destroy);
         delete[] comms;
     }
 }