Define classes for mutex and condition objects.

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index efd0fb759efb346131e0a6643b9912bd8f46da2f..b51f743d8aedb4ed5ceffcc39c6a84c1db854893 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <msg/msg.h>
 #include "hostdata.h"
 #include <string>
 #include <msg/msg.h>
 #include "hostdata.h"

+#include "synchro.h"

 
 class message {
 public:
 
 class message {
 public:


@@ -52,26 +53,16 @@ private:
     // Queue of received messages
     std::queue<m_task_t> received;
 
     // Queue of received messages
     std::queue<m_task_t> received;
 

-    // Control channel for receiving
-    m_task_t    ctrl_task;          // receive buffer
-    msg_comm_t  ctrl_comm;          // receive communication
-
-    // Data channel for receiving
-    m_task_t    data_task;          // receive buffer
-    msg_comm_t  data_comm;          // receive communication
-
-    const char* get_ctrl_mbox() const   { return host->get_ctrl_mbox(); }
-    const char* get_data_mbox() const   { return host->get_data_mbox(); }
-

     // Handling of receiving thread
     // Handling of receiving thread

-    xbt_mutex_t receiver_mutex;
-    xbt_cond_t receiver_cond;
+    mutex_t receiver_mutex;
+    condition_t receiver_cond;

     m_process_t receiver_thread;
     static int receiver_wrapper(int, char* []);
     m_process_t receiver_thread;
     static int receiver_wrapper(int, char* []);

-    void receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox);

     void receiver();
 
     void receiver();
 

-    // Used to test if a communication is over, and to destroy it if it is
+    // Used to chek if a communication is successfull before destroying it
+    static void comm_check_n_destroy(msg_comm_t comm);
+    // If comm is over, call comm_check_n_destroy(comm), and return true

     static bool comm_test_n_destroy(msg_comm_t comm);
 };
 
     static bool comm_test_n_destroy(msg_comm_t comm);
 };