Handle timeout exception in condition_t::timedwait().

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index ecb207ac734b7bd23da0b0137c7d8b090cbc180f..5abb543582c617a948258fc16845abafbf56cfaa 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,13 +1,11 @@
 #include <algorithm>
 #include <algorithm>

-#include <tr1/functional>
+#include <functional>

 #include <msg/msg.h>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"
 #include <msg/msg.h>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"

-#include "options.h"
-#include "simgrid_features.h"

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


@@ -25,15 +23,14 @@ 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())))
 {

-    using std::tr1::bind;

     receiver_thread = new_msg_thread("receiver",
     receiver_thread = new_msg_thread("receiver",

-                                     bind(&communicator::receiver, this));
+                                     std::bind(&communicator::receiver, this));

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


@@ -55,21 +52,18 @@ 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);

-    double msg_size = sizeof *msg;
-    if (msg->get_type() == message::LOAD)
-        msg_size += opt::comm_cost(msg->get_amount());
-    m_task_t task = MSG_task_create("message", 0.0, msg_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);
 }
 
 void communicator::real_flush(sent_comm_type& sent_comm, bool wait)
 {
     return MSG_task_isend(task, dest);
 }
 
 void communicator::real_flush(sent_comm_type& sent_comm, bool wait)
 {

-    sent_comm_type::iterator bound;
-    bound = std::remove_if(sent_comm.begin(), sent_comm.end(),
-                           comm_test_n_destroy);
+    sent_comm_type::iterator bound =
+        std::remove_if(sent_comm.begin(), sent_comm.end(),
+                       comm_test_n_destroy);

     sent_comm.erase(bound, sent_comm.end());
     if (wait && !sent_comm.empty()) {
         size_t size = sent_comm.size();
     sent_comm.erase(bound, sent_comm.end());
     if (wait && !sent_comm.empty()) {
         size_t size = sent_comm.size();


@@ -77,8 +71,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);
         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;
     }
 }
         delete[] comms;
     }
 }


@@ -88,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;
     };