Rename some variables.

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index a2f94e5bf9cff2b9766334fde6103c7476c66cc0..cae340c9c03f4376df9749e53013835a449f4df4 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -9,14 +9,6 @@
 #include <msg/msg.h>
 #include "hostdata.h"
 
 #include <msg/msg.h>
 #include "hostdata.h"
 

-// Cannot include "options.h" without error, so only declare the
-// needed functions.
-namespace opt {
-    bool parse_args(int* argc, char* argv[]);
-    void print();
-    void usage();
-}
-

 class message {
 public:
     enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };
 class message {
 public:
     enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };


@@ -42,8 +34,9 @@ public:
     void send(const char* dest, message* msg);
 
     // Try to get a message.  Returns true on success.
     void send(const char* dest, message* msg);
 
     // Try to get a message.  Returns true on success.

-    // If "wait" is true, blocks until success.
-    bool recv(message*& msg, m_host_t& from, bool wait);
+    // Parameter "timeout" may be 0 for non-blocking operation, -1 for
+    // infinite waiting, or any positive timeout.
+    bool recv(message*& msg, m_host_t& from, double timeout);

 
     // Try to flush pending sending communications.
     // If "wait" is true, blocks until success.
 
     // Try to flush pending sending communications.
     // If "wait" is true, blocks until success.


@@ -53,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;
 


@@ -75,8 +64,11 @@ 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* []);

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

     int receiver();
 
     // Used to test if a communication is over, and to destroy it if it is
     int receiver();
 
     // Used to test if a communication is over, and to destroy it if it is