Rename some variables.

diff --git a/communicator.cpp b/communicator.cpp
index 0b06d6c12d444b033b5e2940ef16f07fb7b74f89..45e43a3efe389502db6a480fff843c23a6cca56a 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -25,19 +25,20 @@ 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)
     , 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_cond_wait(cond, mutex); // wait for the receiver to be ready
-    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()
 }
 
 communicator::~communicator()


@@ -52,12 +53,12 @@ communicator::~communicator()
     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());
 

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

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

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

     }
     }

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

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


@@ -70,8 +71,8 @@ communicator::~communicator()
         XBT_WARN("lost %zu sent message%s!",
                  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)


@@ -93,15 +94,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);
+        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)
         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());
+                    xbt_cond_timedwait(receiver_cond, receiver_mutex,
+                                       deadline - MSG_get_clock());

                 else
                 else

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

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


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

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

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


@@ -156,10 +158,10 @@ int communicator::receiver_wrapper(int, char* [])
     int result = comm->receiver();
 
     XBT_DEBUG("terminate");
     int result = comm->receiver();
 
     XBT_DEBUG("terminate");

-    xbt_mutex_acquire(comm->mutex);
-    comm->receiver_process = NULL;
-    xbt_cond_signal(comm->cond);
-    xbt_mutex_release(comm->mutex);
+    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 result;
 }


@@ -169,10 +171,10 @@ 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);
     MSG_comm_destroy(comm);
     if (strcmp(MSG_task_get_name(task), "finalize")) {
         XBT_DEBUG("received message on %s", mbox);

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

         received.push(task);
         received.push(task);

-        xbt_cond_signal(cond);
-        xbt_mutex_release(mutex);
+        xbt_cond_signal(receiver_cond);
+        xbt_mutex_release(receiver_mutex);

         task = NULL;
         comm = MSG_task_irecv(&task, mbox);
     } else {
         task = NULL;
         comm = MSG_task_irecv(&task, mbox);
     } else {


@@ -188,9 +190,9 @@ 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");
     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(mutex);
-    xbt_cond_signal(cond);      // signal master that we are ready
-    xbt_mutex_release(mutex);
+    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) {


@@ -199,17 +201,17 @@ 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);

-        int recvd = MSG_comm_waitany(comms);
-        msg_comm_t comm = xbt_dynar_get_as(comms, recvd, msg_comm_t);
+        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 (comm == ctrl_comm)
+        if (finished_comm == ctrl_comm)

             receiver1(ctrl_comm, ctrl_task, get_ctrl_mbox());
             receiver1(ctrl_comm, ctrl_task, get_ctrl_mbox());

-        else if (comm == data_comm)
+        else if (finished_comm == data_comm)

             receiver1(data_comm, data_task, get_data_mbox());
         else {
             receiver1(data_comm, data_task, get_data_mbox());
         else {

-            XBT_ERROR("Handling unknown comm -- %p", comm);
-            MSG_comm_destroy(comm);
+            XBT_ERROR("Handling unknown comm -- %p", finished_comm);
+            MSG_comm_destroy(finished_comm);

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

diff --git a/communicator.h b/communicator.h
index 0d47ca0a36305f7035dc1fc36f1de68dfd90134b..cae340c9c03f4376df9749e53013835a449f4df4 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -46,10 +46,6 @@ private:
     // Myself
     const hostdata* host;
 
     // Myself
     const hostdata* host;
 

-    // Used to synchronize main and receiver thread 
-    xbt_mutex_t mutex;
-    xbt_cond_t cond;
-

     // List of pending send communications
     std::list<msg_comm_t> sent_comm;
 
     // List of pending send communications
     std::list<msg_comm_t> sent_comm;
 


@@ -68,7 +64,9 @@ private:
     const char* get_data_mbox() const   { return host->get_data_mbox(); }
 
     // Handling of receiving thread
     const char* get_data_mbox() const   { return host->get_data_mbox(); }
 
     // Handling of receiving thread

-    m_process_t receiver_process;
+    xbt_mutex_t receiver_mutex;
+    xbt_cond_t receiver_cond;
+    m_process_t receiver_thread;

     static int receiver_wrapper(int, char* []);
     void receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox);
     int receiver();
     static int receiver_wrapper(int, char* []);
     void receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox);
     int receiver();