No return value for communicator::receiver().

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 94cdb04160337353a0a1bab8b2797d88c0ce415d..1da6deffea6c2af314a36f0706f22fa1c82964f6 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -9,6 +9,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"
 #include "options.h"
 
 #include "misc.h"
 #include "options.h"

+#include "simgrid_features.h"
+#include "tracing.h"

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


@@ -21,82 +23,95 @@ std::string message::to_string()
     return oss.str();
 }
 
     return oss.str();
 }
 

-const int communicator::send_count_before_flush = 4;
-

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

-    : host((hostdata* )MSG_host_get_data(MSG_host_self()))
-    , mutex(xbt_mutex_init())
-    , cond(xbt_cond_init())
-    , send_counter(0)
+    : host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))

     , ctrl_task(NULL)
     , ctrl_comm(NULL)
     , data_task(NULL)
     , data_comm(NULL)
     , ctrl_task(NULL)
     , ctrl_comm(NULL)
     , data_task(NULL)
     , data_comm(NULL)

+    , receiver_mutex(xbt_mutex_init())
+    , receiver_cond(xbt_cond_init())

 {
 {

-    xbt_mutex_acquire(mutex);
-    receiver_process =
+    xbt_mutex_acquire(receiver_mutex);
+    receiver_thread =

         MSG_process_create("receiver", communicator::receiver_wrapper,
                            this, MSG_host_self());
         MSG_process_create("receiver", communicator::receiver_wrapper,
                            this, MSG_host_self());

-    xbt_mutex_release(mutex);
+    // wait for the receiver to be ready
+    xbt_cond_wait(receiver_cond, receiver_mutex);
+    xbt_mutex_release(receiver_mutex);

 }
 
 communicator::~communicator()
 {
     m_task_t task;
 
 }
 
 communicator::~communicator()
 {
     m_task_t task;
 

-    DEBUG0("send finalize to receiver/ctrl");
+    XBT_DEBUG("send finalize to receiver/ctrl");

     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, get_ctrl_mbox());
 
     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, get_ctrl_mbox());
 

-    DEBUG0("send finalize to receiver/data");
+    XBT_DEBUG("send finalize to receiver/data");

     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, get_data_mbox());
 
     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, get_data_mbox());
 

-    DEBUG0("wait for receiver to terminate");
-    xbt_mutex_acquire(mutex);
-    while (receiver_process)
-        xbt_cond_wait(cond, mutex);
-    xbt_mutex_release(mutex);
+    xbt_mutex_acquire(receiver_mutex);
+    while (receiver_thread) {
+        XBT_DEBUG("waiting for receiver to terminate");
+        xbt_cond_wait(receiver_cond, receiver_mutex);
+    }
+    xbt_mutex_release(receiver_mutex);

 
     if (ctrl_comm)
 
     if (ctrl_comm)

-        WARN0("ctrl_comm is pending!");
+        XBT_WARN("ctrl_comm is pending!");

     if (data_comm)
     if (data_comm)

-        WARN0("data_comm is pending!");
+        XBT_WARN("data_comm is pending!");

     if (!received.empty())
     if (!received.empty())

-        WARN2("lost %lu received message%s!",
-              (unsigned long )received.size(), ESSE(received.size()));
+        XBT_WARN("lost %zu received message%s!",
+                 received.size(), ESSE(received.size()));

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

-        WARN2("lost %lu sent message%s!",
-              (unsigned long )sent_comm.size(), ESSE(sent_comm.size()));
+        XBT_WARN("lost %zu sent message%s!",
+                 sent_comm.size(), ESSE(sent_comm.size()));

 
 

-    xbt_cond_destroy(cond);
-    xbt_mutex_destroy(mutex);
+    xbt_cond_destroy(receiver_cond);
+    xbt_mutex_destroy(receiver_mutex);

 }
 
 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);
+    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);    
     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_comm_t comm = MSG_task_isend(task, dest);
     sent_comm.push_back(comm);
     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, double timeout)

 {
 {

-    if (wait) {
-        DEBUG0("suspend main process on recv");
-        xbt_mutex_acquire(mutex);
-        while (received.empty())
-            xbt_cond_wait(cond, mutex);
-        xbt_mutex_release(mutex);
+    if (timeout != 0) {
+        volatile double deadline =
+            timeout > 0 ? MSG_get_clock() + timeout : 0.0;
+        xbt_mutex_acquire(receiver_mutex);
+        while (received.empty() && (!deadline || deadline > MSG_get_clock())) {
+            xbt_ex_t e;
+            XBT_DEBUG("waiting for a message to come");
+            TRY {
+                if (deadline)
+                    xbt_cond_timedwait(receiver_cond, receiver_mutex,
+                                       deadline - MSG_get_clock());
+                else
+                    xbt_cond_wait(receiver_cond, receiver_mutex);
+            }
+            CATCH (e) {
+                if (e.category != timeout_error)
+                    RETHROW;
+                xbt_ex_free(e);
+            }
+        }
+        xbt_mutex_release(receiver_mutex);

     }
 
     if (received.empty())
     }
 
     if (received.empty())


@@ -104,11 +119,11 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
 
     m_task_t task = received.front();
     received.pop();
 
     m_task_t task = received.front();
     received.pop();

-    msg = (message* )MSG_task_get_data(task);
+    msg = static_cast<message*>(MSG_task_get_data(task));

     from = MSG_task_get_source(task);
     MSG_task_destroy(task);
 
     from = MSG_task_get_source(task);
     MSG_task_destroy(task);
 

-    DEBUG2("received %s from %s",
+    XBT_DEBUG("received %s from %s",

            msg->to_string().c_str(), MSG_host_get_name(from));
 
     return true;
            msg->to_string().c_str(), MSG_host_get_name(from));
 
     return true;


@@ -116,21 +131,14 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
 
 void communicator::flush(bool wait)
 {
 
 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()) {
     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);
+        msg_comm_t comms[sent_comm.size()];
+        std::copy(sent_comm.begin(), sent_comm.end(), comms);
+        MSG_comm_waitall(comms, sent_comm.size(), -1.0);
+        if (!MSG_WAIT_DESTROYS_COMMS)
+            std::for_each(sent_comm.begin(), sent_comm.end(), MSG_comm_destroy);
+        sent_comm.clear();

     }
 }
 
     }
 }
 


@@ -146,22 +154,46 @@ bool communicator::comm_test_n_destroy(msg_comm_t comm)
 int communicator::receiver_wrapper(int, char* [])
 {
     communicator* comm;
 int communicator::receiver_wrapper(int, char* [])
 {
     communicator* comm;

-    comm = (communicator* )MSG_process_get_data(MSG_process_self());
-    int result = comm->receiver();
+    comm = static_cast<communicator*>(MSG_process_get_data(MSG_process_self()));
+    comm->receiver();

 
 

-    DEBUG0("terminate");
-    xbt_mutex_acquire(comm->mutex);
-    comm->receiver_process = NULL;
-    xbt_cond_signal(comm->cond);
-    xbt_mutex_release(comm->mutex);
+    XBT_DEBUG("terminate");
+    xbt_mutex_acquire(comm->receiver_mutex);
+    comm->receiver_thread = NULL;
+    xbt_cond_signal(comm->receiver_cond);
+    xbt_mutex_release(comm->receiver_mutex);

 
 

-    return result;
+    return 0;

 }
 
 }
 

-int communicator::receiver()
+void communicator::receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox)
+{
+    MSG_comm_destroy(comm);
+    if (strcmp(MSG_task_get_name(task), "finalize")) {
+        XBT_DEBUG("received message on %s", mbox);
+        xbt_mutex_acquire(receiver_mutex);
+        received.push(task);
+        xbt_cond_signal(receiver_cond);
+        xbt_mutex_release(receiver_mutex);
+        task = NULL;
+        comm = MSG_task_irecv(&task, mbox);
+    } else {
+        XBT_DEBUG("received finalize on %s", mbox);
+        MSG_task_destroy(task);
+        task = NULL;
+        comm = NULL;
+    }
+}
+
+void communicator::receiver()

 {
     ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
     data_comm = MSG_task_irecv(&data_task, get_data_mbox());
 {
     ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
     data_comm = MSG_task_irecv(&data_task, get_data_mbox());

+    XBT_DEBUG("receiver ready");
+    xbt_mutex_acquire(receiver_mutex);
+    xbt_cond_signal(receiver_cond); // signal master that we are ready
+    xbt_mutex_release(receiver_mutex);
+

     xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
     while (ctrl_comm || data_comm) {
 
     xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
     while (ctrl_comm || data_comm) {
 


@@ -169,42 +201,18 @@ int communicator::receiver()
             xbt_dynar_push(comms, &ctrl_comm);
         if (data_comm)
             xbt_dynar_push(comms, &data_comm);
             xbt_dynar_push(comms, &ctrl_comm);
         if (data_comm)
             xbt_dynar_push(comms, &data_comm);

-        MSG_comm_waitany(comms);
+        int index = MSG_comm_waitany(comms);
+        msg_comm_t finished_comm = xbt_dynar_get_as(comms, index, msg_comm_t);

         xbt_dynar_reset(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");
-                received.push(ctrl_task);
-                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");
-                received.push(data_task);
-                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);
-        xbt_cond_signal(cond);
-        xbt_mutex_release(mutex);
+        if (finished_comm == ctrl_comm)
+            receiver1(ctrl_comm, ctrl_task, get_ctrl_mbox());
+        else if (finished_comm == data_comm)
+            receiver1(data_comm, data_task, get_data_mbox());
+        else
+            THROW1(0, 0, "Cannot handle unknown comm -- %p", finished_comm);

     }
     xbt_dynar_free(&comms);
     }
     xbt_dynar_free(&comms);

-    return 0;

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