Do not import full std::tr1 namespace.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 4b54161108fd6808bb47c8bb8b4ad6cbb163b045..f3e6bf9fae1eddd27ec2f25e11977dfd727d15c4 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,28 +1,30 @@
-#include "communicator.h"
-
 #include <algorithm>
 #include <tr1/functional>
 #include <sstream>
 #include <msg/msg.h>
 #include <xbt/log.h>
-#include "simgrid_features.h"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
+
 #include "misc.h"
+#include "options.h"
 
-// XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm, simu,
-                                "Messages from asynchronous pipes");
+#include "communicator.h"
 
 std::string message::to_string()
 {
     static const char* str[] = { "INFO", "CREDIT", "LOAD",
                                  "CTRL_CLOSE", "DATA_CLOSE" };
     std::ostringstream oss;
-    oss << str[type] << " (" << amount << ")";
+    oss << str[type] << ": " << amount;
     return oss.str();
 }
 
+const int communicator::send_count_before_flush = 4;
+
 communicator::communicator()
     : host((hostdata* )MSG_host_get_data(MSG_host_self()))
+    , send_counter(0)
     , ctrl_task(NULL)
     , ctrl_comm(NULL)
     , ctrl_close_is_last(false)
@@ -51,12 +53,18 @@ void communicator::listen()
 
 void communicator::send(const char* dest, message* msg)
 {
+    DEBUG2("send %s to %s", msg->to_string().c_str(), dest);
     double msg_size = sizeof *msg;
     if (msg->get_type() == message::LOAD)
-        msg_size += msg->get_amount();
+        msg_size += opt::comm_cost(msg->get_amount());
     m_task_t task = MSG_task_create("message", 0.0, msg_size, msg);    
     msg_comm_t comm = MSG_task_isend(task, dest);
     sent_comm.push_back(comm);
+
+    if (++send_counter >= send_count_before_flush) {
+        flush(false);
+        send_counter = 0;
+    }
 }
 
 bool communicator::recv(message*& msg, m_host_t& from, bool wait)
@@ -98,18 +106,25 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
         }
     } while (restart);
 
+    if (msg)
+        DEBUG2("received %s from %s",
+               msg->to_string().c_str(), MSG_host_get_name(from));
+
     return msg != NULL;
 }
 
 void communicator::flush(bool wait)
 {
+    using std::tr1::bind;
+    using std::tr1::placeholders::_1;
+
     sent_comm.remove_if(comm_test_n_destroy);
     if (wait && !sent_comm.empty()) {
         xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
         while (!sent_comm.empty()) {
             std::for_each(sent_comm.begin(), sent_comm.end(),
-                          std::tr1::bind(comm_push_in_dynar,
-                                         comms, std::tr1::placeholders::_1));
+                          bind(xbt_dynar_push,
+                               comms, bind(misc::address<msg_comm_t>(), _1)));
             MSG_comm_waitany(comms);
             xbt_dynar_reset(comms);
             sent_comm.remove_if(comm_test_n_destroy);
@@ -128,11 +143,6 @@ void communicator::next_close_on_data_is_last()
     data_close_is_last = true;
 }
 
-void communicator::comm_push_in_dynar(xbt_dynar_t dynar, msg_comm_t comm)
-{
-    xbt_dynar_push(dynar, &comm);
-}
-
 bool communicator::comm_test_n_destroy(msg_comm_t comm)
 {
     if (MSG_comm_test(comm)) {