Use a shorter name for function in deployment_generator.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 45b52ef73eb1c76bbfecd528bcb89aab8c8a5bc9..e6653ebda4e9acf52d0c5a40acd8e8c4f09f1d61 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,31 +1,36 @@
+#include "communicator.h"
+

 #include <algorithm>
 #include <tr1/functional>
 #include <algorithm>
 #include <tr1/functional>

-#include <cstring>
+#include <sstream>

 #include <msg/msg.h>
 #include <xbt/log.h>
 #include <msg/msg.h>
 #include <xbt/log.h>

-#include "communicator.h"
-#include "simgrid_features.h"

 #include "misc.h"
 #include "misc.h"

+#include "options.h"

 
 

-// XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(comm, simu,
-                                "Messages from asynchronous pipes");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);

 
 

-communicator::communicator()
+std::string message::to_string()

 {
 {

-    const char* hostname = MSG_host_get_name(MSG_host_self());
+    static const char* str[] = { "INFO", "CREDIT", "LOAD",
+                                 "CTRL_CLOSE", "DATA_CLOSE" };
+    std::ostringstream oss;
+    oss << str[type] << ": " << amount;
+    return oss.str();
+}

 
 

-    ctrl_mbox = hostname;
-    ctrl_mbox += "_ctrl";
-    ctrl_task = NULL;
-    ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
-    ctrl_close_is_last = false;
+const int communicator::send_count_before_flush = 16;

 
 

-    data_mbox = hostname;
-    data_mbox += "_data";
-    data_task = NULL;
-    data_comm = MSG_task_irecv(&data_task, get_data_mbox());
-    data_close_is_last = false;
+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)
+    , data_task(NULL)
+    , data_comm(NULL)
+    , data_close_is_last(false)
+{

 }
 
 communicator::~communicator()
 }
 
 communicator::~communicator()


@@ -39,14 +44,26 @@ communicator::~communicator()
               (long )sent_comm.size(), ESSE(sent_comm.size()));
 }
 
               (long )sent_comm.size(), ESSE(sent_comm.size()));
 }
 

+void communicator::listen()
+{
+    ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
+    data_comm = MSG_task_irecv(&data_task, get_data_mbox());
+}
+

 void communicator::send(const char* dest, message* msg)
 {
 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)
     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);    
     m_task_t task = MSG_task_create("message", 0.0, msg_size, msg);    

-    sent_comm.push_back(MSG_task_isend(task, dest));
-    flush_sent();
+    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)
 }
 
 bool communicator::recv(message*& msg, m_host_t& from, bool wait)


@@ -62,8 +79,8 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
             ctrl_task = NULL;
             ctrl_comm =
                 (!ctrl_close_is_last || msg->get_type() != message::CTRL_CLOSE)
             ctrl_task = NULL;
             ctrl_comm =
                 (!ctrl_close_is_last || msg->get_type() != message::CTRL_CLOSE)

-                ? ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox())
-                : ctrl_comm = NULL;
+                ? MSG_task_irecv(&ctrl_task, get_ctrl_mbox())
+                : NULL;

 
         } else if (data_comm && comm_test_n_destroy(data_comm)) {
             msg = (message* )MSG_task_get_data(data_task);
 
         } else if (data_comm && comm_test_n_destroy(data_comm)) {
             msg = (message* )MSG_task_get_data(data_task);


@@ -72,8 +89,8 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
             data_task = NULL;
             data_comm =
                 (!data_close_is_last || msg->get_type() != message::DATA_CLOSE)
             data_task = NULL;
             data_comm =
                 (!data_close_is_last || msg->get_type() != message::DATA_CLOSE)

-                ? data_comm = MSG_task_irecv(&data_task, get_data_mbox())
-                : data_comm = NULL;
+                ? MSG_task_irecv(&data_task, get_data_mbox())
+                : NULL;

         }
 
         restart = wait && !msg && (ctrl_comm || data_comm);
         }
 
         restart = wait && !msg && (ctrl_comm || data_comm);


@@ -88,21 +105,31 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
         }
     } while (restart);
 
         }
     } while (restart);
 

+    if (msg)
+        DEBUG2("received %s from %s",
+               msg->to_string().c_str(), MSG_host_get_name(from));
+

     return msg != NULL;
 }
 
     return msg != NULL;
 }
 

-void communicator::wait_for_sent()
+void communicator::flush(bool wait)

 {
 {

-    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(xbt_dynar_push,
-                                     comms, std::tr1::placeholders::_1));
-        MSG_comm_waitany(comms);
-        xbt_dynar_reset(comms);
-        flush_sent();
+    using namespace std::tr1;
+    using namespace std::tr1::placeholders;
+
+    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(),
+                          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);
+        }
+        xbt_dynar_free(&comms);

     }
     }

-    xbt_dynar_free(&comms);

 }
 
 void communicator::next_close_on_ctrl_is_last()
 }
 
 void communicator::next_close_on_ctrl_is_last()


@@ -115,13 +142,7 @@ void communicator::next_close_on_data_is_last()
     data_close_is_last = true;
 }
 
     data_close_is_last = true;
 }
 

-int communicator::send_backlog()
-{
-    flush_sent();
-    return sent_comm.size();
-}
-
-bool communicator::comm_test_n_destroy(msg_comm_t& comm)
+bool communicator::comm_test_n_destroy(msg_comm_t comm)

 {
     if (MSG_comm_test(comm)) {
         MSG_comm_destroy(comm);
 {
     if (MSG_comm_test(comm)) {
         MSG_comm_destroy(comm);


@@ -130,11 +151,6 @@ bool communicator::comm_test_n_destroy(msg_comm_t& comm)
         return false;
 }
 
         return false;
 }
 

-void communicator::flush_sent()
-{
-    std::remove_if(sent_comm.begin(), sent_comm.end(), comm_test_n_destroy);
-}
-

 // Local variables:
 // mode: c++
 // End:
 // Local variables:
 // mode: c++
 // End: