Define classes for mutex and condition objects.

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 0b06d6c12d444b033b5e2940ef16f07fb7b74f89..506f126ce14b37975b4e61dfee62302a1b89f4be 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -25,19 +25,13 @@ std::string message::to_string()
 
 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())))

-    , mutex(xbt_mutex_init())
-    , cond(xbt_cond_init())
-    , ctrl_task(NULL)
-    , ctrl_comm(NULL)
-    , data_task(NULL)
-    , data_comm(NULL)

 {
 {

-    xbt_mutex_acquire(mutex);
-    receiver_process =
+    receiver_mutex.acquire();
+    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_cond_wait(cond, mutex); // wait for the receiver to be ready
-    xbt_mutex_release(mutex);
+    receiver_cond.wait(receiver_mutex); // wait for the receiver to be ready
+    receiver_mutex.release();

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


@@ -46,32 +40,25 @@ communicator::~communicator()
 
     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);

-    MSG_task_send(task, get_ctrl_mbox());
+    MSG_task_send(task, host->get_ctrl_mbox());

 
     XBT_DEBUG("send finalize to receiver/data");
     task = MSG_task_create("finalize", 0.0, 0, NULL);
 
     XBT_DEBUG("send finalize to receiver/data");
     task = MSG_task_create("finalize", 0.0, 0, NULL);

-    MSG_task_send(task, get_data_mbox());
+    MSG_task_send(task, host->get_data_mbox());

 
 

-    xbt_mutex_acquire(mutex);
-    while (receiver_process) {
+    receiver_mutex.acquire();
+    while (receiver_thread) {

         XBT_DEBUG("waiting for receiver to terminate");
         XBT_DEBUG("waiting for receiver to terminate");

-        xbt_cond_wait(cond, mutex);
+        receiver_cond.wait(receiver_mutex);

     }
     }

-    xbt_mutex_release(mutex);
+    receiver_mutex.release();

 
 

-    if (ctrl_comm)
-        XBT_WARN("ctrl_comm is pending!");
-    if (data_comm)
-        XBT_WARN("data_comm is pending!");

     if (!received.empty())
         XBT_WARN("lost %zu received message%s!",
                  received.size(), ESSE(received.size()));
     if (!sent_comm.empty())
         XBT_WARN("lost %zu sent message%s!",
                  sent_comm.size(), ESSE(sent_comm.size()));
     if (!received.empty())
         XBT_WARN("lost %zu received message%s!",
                  received.size(), ESSE(received.size()));
     if (!sent_comm.empty())
         XBT_WARN("lost %zu sent message%s!",
                  sent_comm.size(), ESSE(sent_comm.size()));

-
-    xbt_cond_destroy(cond);
-    xbt_mutex_destroy(mutex);

 }
 
 void communicator::send(const char* dest, message* msg)
 }
 
 void communicator::send(const char* dest, message* msg)


@@ -93,15 +80,16 @@ bool communicator::recv(message*& msg, m_host_t& from, double timeout)
     if (timeout != 0) {
         volatile double deadline =
             timeout > 0 ? MSG_get_clock() + timeout : 0.0;
     if (timeout != 0) {
         volatile double deadline =
             timeout > 0 ? MSG_get_clock() + timeout : 0.0;

-        xbt_mutex_acquire(mutex);
+        receiver_mutex.acquire();

         while (received.empty() && (!deadline || deadline > MSG_get_clock())) {
             xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");
             TRY {
                 if (deadline)
         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(cond, mutex, deadline - MSG_get_clock());
+                    receiver_cond.timedwait(receiver_mutex,
+                                            deadline - MSG_get_clock());

                 else
                 else

-                    xbt_cond_wait(cond, mutex);
+                    receiver_cond.wait(receiver_mutex);

             }
             CATCH (e) {
                 if (e.category != timeout_error)
             }
             CATCH (e) {
                 if (e.category != timeout_error)


@@ -109,7 +97,7 @@ bool communicator::recv(message*& msg, m_host_t& from, double timeout)
                 xbt_ex_free(e);
             }
         }
                 xbt_ex_free(e);
             }
         }

-        xbt_mutex_release(mutex);
+        receiver_mutex.release();

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


@@ -135,85 +123,93 @@ void communicator::flush(bool wait)
         std::copy(sent_comm.begin(), sent_comm.end(), comms);
         MSG_comm_waitall(comms, sent_comm.size(), -1.0);
         if (!MSG_WAIT_DESTROYS_COMMS)
         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);
+            std::for_each(sent_comm.begin(), sent_comm.end(),
+                          comm_check_n_destroy);

         sent_comm.clear();
     }
 }
 
         sent_comm.clear();
     }
 }
 

-bool communicator::comm_test_n_destroy(msg_comm_t comm)
-{
-    if (MSG_comm_test(comm)) {
-        MSG_comm_destroy(comm);
-        return true;
-    } else
-        return false;
-}
-

 int communicator::receiver_wrapper(int, char* [])
 {
     communicator* comm;
     comm = static_cast<communicator*>(MSG_process_get_data(MSG_process_self()));
 int communicator::receiver_wrapper(int, char* [])
 {
     communicator* comm;
     comm = static_cast<communicator*>(MSG_process_get_data(MSG_process_self()));

-    int result = comm->receiver();
+    comm->receiver();

 
     XBT_DEBUG("terminate");
 
     XBT_DEBUG("terminate");

-    xbt_mutex_acquire(comm->mutex);
-    comm->receiver_process = NULL;
-    xbt_cond_signal(comm->cond);
-    xbt_mutex_release(comm->mutex);
+    comm->receiver_mutex.acquire();
+    comm->receiver_thread = NULL;
+    comm->receiver_cond.signal();
+    comm->receiver_mutex.release();

 
 

-    return result;
+    return 0;

 }
 
 }
 

-void communicator::receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox)
+void communicator::receiver()

 {
 {

-    MSG_comm_destroy(comm);
-    if (strcmp(MSG_task_get_name(task), "finalize")) {
-        XBT_DEBUG("received message on %s", mbox);
-        xbt_mutex_acquire(mutex);
-        received.push(task);
-        xbt_cond_signal(cond);
-        xbt_mutex_release(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;
+    xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+    struct channel {
+        msg_comm_t comm;
+        m_task_t task;
+        const char* mbox;
+    };
+    channel chan[] = { { NULL, NULL, host->get_ctrl_mbox() },
+                       { NULL, NULL, host->get_data_mbox() } };
+    const int chan_size = (sizeof chan) / (sizeof chan[0]);
+
+    for (int i = 0 ; i < chan_size ; ++i) {
+        chan[i].comm = MSG_task_irecv(&chan[i].task, chan[i].mbox);
+        xbt_dynar_push(comms, &chan[i].comm);

     }
     }

-}

 
 

-int communicator::receiver()
-{
-    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_DEBUG("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);
-        int recvd = MSG_comm_waitany(comms);
-        msg_comm_t comm = xbt_dynar_get_as(comms, recvd, msg_comm_t);
-        xbt_dynar_reset(comms);
-
-        if (comm == ctrl_comm)
-            receiver1(ctrl_comm, ctrl_task, get_ctrl_mbox());
-        else if (comm == data_comm)
-            receiver1(data_comm, data_task, get_data_mbox());
-        else {
-            XBT_ERROR("Handling unknown comm -- %p", comm);
-            MSG_comm_destroy(comm);
+    receiver_mutex.acquire();
+    receiver_cond.signal();     // signal master that we are ready
+    receiver_mutex.release();
+
+    while (!xbt_dynar_is_empty(comms)) {
+
+        int index = MSG_comm_waitany(comms);
+        msg_comm_t finished_comm = xbt_dynar_get_as(comms, index, msg_comm_t);
+        channel* ch;
+
+        for (ch = chan ; ch->comm != finished_comm ; ++ch)
+            /* nop */;
+
+        comm_check_n_destroy(ch->comm);
+        if (strcmp(MSG_task_get_name(ch->task), "finalize")) {
+            XBT_DEBUG("received message on %s", ch->mbox);
+            receiver_mutex.acquire();
+            received.push(ch->task);
+            receiver_cond.signal();
+            receiver_mutex.release();
+            ch->task = NULL;
+            ch->comm = MSG_task_irecv(&ch->task, ch->mbox);
+            xbt_dynar_set_as(comms, index, msg_comm_t, ch->comm);
+        } else {
+            XBT_DEBUG("received finalize on %s", ch->mbox);
+            MSG_task_destroy(ch->task);
+            ch->task = NULL;
+            ch->comm = NULL;
+            xbt_dynar_remove_at(comms, index, NULL);

         }
         }

+

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

-    return 0;
+}
+
+void communicator::comm_check_n_destroy(msg_comm_t comm)
+{
+    xbt_assert(MSG_comm_get_status(comm) == MSG_OK);
+    MSG_comm_destroy(comm);
+}
+
+bool communicator::comm_test_n_destroy(msg_comm_t comm)
+{
+    if (MSG_comm_test(comm)) {
+        comm_check_n_destroy(comm);
+        return true;
+    } else
+        return false;

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