Add option "-s" for controlling the minimum duration between iterations.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 93389c756d1253b9ade6e530556a3b3eb0965281..8adb258e536b83c0c85d9fbf7524ad71125732f4 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -1,138 +1,215 @@
 #include <algorithm>
 #include <cstring>
 #include <algorithm>
 #include <cstring>

+#include <tr1/functional>
+#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"

 
 

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

 
 

-namespace {
+#include "misc.h"
+#include "options.h"

 
 

-    bool comm_test_n_destroy(msg_comm_t& comm)
-    {
-        if (MSG_comm_test(comm)) {
-            MSG_comm_destroy(comm);
-            return true;
-        } else
-            return false;
-    }
+#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;
+    return oss.str();

 }
 
 }
 

-class communicator::message  {
-public:
-    message(message_type t, double a): type(t), amount(a) { }
-
-    message_type type;
-    double amount;
-};
-

 communicator::communicator()
 communicator::communicator()

+    : host((hostdata* )MSG_host_get_data(MSG_host_self()))
+    , mutex(xbt_mutex_init())
+    , cond(xbt_cond_init())
+    , ctrl_task(NULL)
+    , ctrl_comm(NULL)
+    , data_task(NULL)
+    , data_comm(NULL)

 {
 {

-    const char* hostname = MSG_host_get_name(MSG_host_self());
-    ctrl_mbox = bprintf("%s_ctrl", hostname);
-    ctrl_task = NULL;
-    ctrl_comm = MSG_task_irecv(&ctrl_task, ctrl_mbox);
-
-    data_mbox = bprintf("%s_data", hostname);
-    data_task = NULL;
-    data_comm = MSG_task_irecv(&data_task, data_mbox);
+    xbt_mutex_acquire(mutex);
+    receiver_process =
+        MSG_process_create("receiver", communicator::receiver_wrapper,
+                           this, MSG_host_self());
+    xbt_cond_wait(cond, mutex); // wait for the receiver to be ready
+    xbt_mutex_release(mutex);

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

-    // fixme: don't know how to free pending communications
-    // (data_comm, ctrl_comm and sent_comm)
+    m_task_t task;
+
+    DEBUG0("send finalize to receiver/ctrl");
+    task = MSG_task_create("finalize", 0.0, 0, NULL);
+    MSG_task_send(task, get_ctrl_mbox());

 
 

-    free(data_mbox);
-    free(ctrl_mbox);
+    DEBUG0("send finalize to receiver/data");
+    task = MSG_task_create("finalize", 0.0, 0, NULL);
+    MSG_task_send(task, get_data_mbox());

 
 

-    flush_sent();
+    xbt_mutex_acquire(mutex);
+    while (receiver_process) {
+        DEBUG0("waiting for receiver to terminate");
+        xbt_cond_wait(cond, mutex);
+    }
+    xbt_mutex_release(mutex);
+
+    if (ctrl_comm)
+        WARN0("ctrl_comm is pending!");
+    if (data_comm)
+        WARN0("data_comm is pending!");
+    if (!received.empty())
+        WARN2("lost %lu received message%s!",
+              (unsigned long )received.size(), ESSE(received.size()));

     if (!sent_comm.empty())
     if (!sent_comm.empty())

-        WARN1("Lost %ld send communications!", (long )sent_comm.size());
-}
+        WARN2("lost %lu sent message%s!",
+              (unsigned long )sent_comm.size(), ESSE(sent_comm.size()));

 
 

-void communicator::send_info(const neighbor& dest, double amount)
-{
-    message* msg = new message(INFO_MSG, amount);
-    m_task_t task = MSG_task_create("load msg", 0.0, sizeof *msg, msg);
-    send(dest.get_ctrl_mbox(), task);
+    xbt_cond_destroy(cond);
+    xbt_mutex_destroy(mutex);

 }
 
 }
 

-void communicator::send_credit(const neighbor& dest, double amount)
+void communicator::send(const char* dest, message* msg)

 {
 {

-    message* msg = new message(CREDIT_MSG, amount);
-    m_task_t task = MSG_task_create("credit msg", 0.0, sizeof *msg, msg);
-    send(dest.get_ctrl_mbox(), task);
+    DEBUG2("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);    
+    msg_comm_t comm = MSG_task_isend(task, dest);
+    sent_comm.push_back(comm);

 }
 
 }
 

-void communicator::send_load(const neighbor& dest, double amount)
+bool communicator::recv(message*& msg, m_host_t& from, bool wait)

 {
 {

-    m_task_t task = MSG_task_create("data msg", 0.0, amount, NULL);
-    send(dest.get_data_mbox(), task);
-}
+    if (wait) {
+        xbt_mutex_acquire(mutex);
+        while (received.empty()) {
+            DEBUG0("waiting for a message to come");
+            xbt_cond_wait(cond, mutex);
+        }
+        xbt_mutex_release(mutex);
+    }

 
 

-void communicator::send(const char* dest, m_task_t task)
-{
-    sent_comm.push_back(MSG_task_isend(task, dest));
-    flush_sent();
-}
+    if (received.empty())
+        return false;

 
 

-bool communicator::recv_info(double& amount, m_host_t& from)
-{
-    return recv_ctrl(INFO_MSG, amount, from);
-}
+    m_task_t task = received.front();
+    received.pop();
+    msg = (message* )MSG_task_get_data(task);
+    from = MSG_task_get_source(task);
+    MSG_task_destroy(task);

 
 

-bool communicator::recv_credit(double& amount, m_host_t& from)
-{
-    return recv_ctrl(CREDIT_MSG, amount, from);
+    DEBUG2("received %s from %s",
+           msg->to_string().c_str(), MSG_host_get_name(from));
+
+    return true;

 }
 
 }
 

-bool communicator::recv_load(double& amount, m_host_t& from)
+void communicator::flush(bool wait)

 {
 {

-    bool res = comm_test_n_destroy(data_comm);
-    if (res) {
-        amount = MSG_task_get_data_size(data_task);
-        from = MSG_task_get_source(data_task);
-        MSG_task_destroy(data_task);
-        data_task = NULL;
-        data_comm = MSG_task_irecv(&data_task, data_mbox);
+    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(),
+                          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);

     }
     }

-    return res;

 }
 
 }
 

-bool communicator::recv_ctrl(message_type type, double& amount, m_host_t& from)
+bool communicator::comm_test_n_destroy(msg_comm_t comm)

 {
 {

-    bool res = MSG_comm_test(ctrl_comm);
-    if (res) {
-        message* msg = (message* )MSG_task_get_data(ctrl_task);
-        if (msg->type == type) {
-            MSG_comm_destroy(ctrl_comm);
-            amount = msg->amount;
-            from = MSG_task_get_source(ctrl_task);
-            delete msg;
-            MSG_task_destroy(ctrl_task);
-            ctrl_task = NULL;
-            ctrl_comm = MSG_task_irecv(&ctrl_task, ctrl_mbox);
-        } else {
-            res = false;
-        }
-    }
-    return res;
+    if (MSG_comm_test(comm)) {
+        MSG_comm_destroy(comm);
+        return true;
+    } else
+        return false;

 }
 
 }
 

-int communicator::send_backlog()
+int communicator::receiver_wrapper(int, char* [])

 {
 {

-    flush_sent();
-    return sent_comm.size();
+    communicator* comm;
+    comm = (communicator* )MSG_process_get_data(MSG_process_self());
+    int result = comm->receiver();
+
+    DEBUG0("terminate");
+    xbt_mutex_acquire(comm->mutex);
+    comm->receiver_process = NULL;
+    xbt_cond_signal(comm->cond);
+    xbt_mutex_release(comm->mutex);
+
+    return result;

 }
 
 }
 

-void communicator::flush_sent()
+int communicator::receiver()

 {
 {

-    std::remove_if(sent_comm.begin(), sent_comm.end(), comm_test_n_destroy);
+    ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
+    data_comm = MSG_task_irecv(&data_task, get_data_mbox());
+    DEBUG0("receiver ready");
+    xbt_mutex_acquire(mutex);
+    xbt_cond_signal(cond);      // signal master that we are ready
+    xbt_mutex_release(mutex);
+
+    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+    while (ctrl_comm || data_comm) {
+
+        if (ctrl_comm)
+            xbt_dynar_push(comms, &ctrl_comm);
+        if (data_comm)
+            xbt_dynar_push(comms, &data_comm);
+        MSG_comm_waitany(comms);
+        xbt_dynar_reset(comms);
+
+        if (ctrl_comm && comm_test_n_destroy(ctrl_comm)) {
+            if (strcmp(MSG_task_get_name(ctrl_task), "finalize")) {
+                DEBUG0("received message from ctrl");
+                xbt_mutex_acquire(mutex);
+                received.push(ctrl_task);
+                xbt_mutex_release(mutex);
+                ctrl_task = NULL;
+                ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
+            } else {
+                DEBUG0("received finalize from ctrl");
+                MSG_task_destroy(ctrl_task);
+                ctrl_task = NULL;
+                ctrl_comm = NULL;
+            }
+        }
+
+        if (data_comm && comm_test_n_destroy(data_comm)) {
+            if (strcmp(MSG_task_get_name(data_task), "finalize")) {
+                DEBUG0("received message from data");
+                xbt_mutex_acquire(mutex);
+                received.push(data_task);
+                xbt_mutex_release(mutex);
+                data_task = NULL;
+                data_comm = MSG_task_irecv(&data_task, get_data_mbox());
+            } else {
+                DEBUG0("received finalize from data");
+                MSG_task_destroy(data_task);
+                data_task = NULL;
+                data_comm = NULL;
+            }
+        }
+        xbt_mutex_acquire(mutex);
+        if (!received.empty())
+            xbt_cond_signal(cond);
+        xbt_mutex_release(mutex);
+    }
+    xbt_dynar_free(&comms);
+    return 0;

 }
 
 // Local variables:
 }
 
 // Local variables: