merge de loba_fairstrategy

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index ba4b86e96598cb06b68db102996f4b8e0ef194b3..66dc800b4feeea9502902348847fa85757e41682 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -34,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.


@@ -51,8 +52,6 @@ private:
 
     // List of pending send communications
     std::list<msg_comm_t> sent_comm;
 
     // List of pending send communications
     std::list<msg_comm_t> sent_comm;

-    static const int send_count_before_flush;
-    int send_counter;

 
     // Queue of received messages
     std::queue<m_task_t> received;
 
     // Queue of received messages
     std::queue<m_task_t> received;