Cosmetics.

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index 66dc800b4feeea9502902348847fa85757e41682..efd0fb759efb346131e0a6643b9912bd8f46da2f 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,9 +64,12 @@ 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* []);
     static int receiver_wrapper(int, char* []);

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

 
     // Used to test if a communication is over, and to destroy it if it is
     static bool comm_test_n_destroy(msg_comm_t comm);
 
     // Used to test if a communication is over, and to destroy it if it is
     static bool comm_test_n_destroy(msg_comm_t comm);