X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/b78d5563826957045678f4c3bcfdcef6c9bfc48d..82a490fdda330eb916eb059929de4be817fe8a87:/communicator.h?ds=sidebyside

diff --git a/communicator.h b/communicator.h
index 465d0cf..b51f743 100644
--- a/communicator.h
+++ b/communicator.h
@@ -4,9 +4,11 @@
 #define COMMUNICATOR_H
 
 #include <list>
+#include <queue>
 #include <string>
 #include <msg/msg.h>
 #include "hostdata.h"
+#include "synchro.h"
 
 class message {
 public:
@@ -29,49 +31,38 @@ public:
     communicator();
     ~communicator();
 
-    // Start to listen for incoming messages
-    void listen();
-
     // Send a message to the "dest" mailbox
     void send(const char* dest, message* msg);
 
-    // Try to receive a message.  Returns true on success.
-    // If "wait" is true, blocks until success or error.
-    bool recv(message*& msg, m_host_t& from, bool wait);
+    // Try to get a message.  Returns true on success.
+    // 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.
     void flush(bool wait);
 
-    // Advertise that the next "close" message is the last one, and
-    // that we do not await any message after that, either on the
-    // control or the data channel.
-    void next_close_on_ctrl_is_last();
-    void next_close_on_data_is_last();
-
 private:
     // Myself
     const hostdata* host;
 
     // List of pending send communications
     std::list<msg_comm_t> sent_comm;
-    static const int send_count_before_flush;
-    int send_counter;
-
-    // Control channel for receiving
-    m_task_t    ctrl_task;          // receive buffer
-    msg_comm_t  ctrl_comm;          // receive communication
-    bool        ctrl_close_is_last; // do not rearm comm after next close
 
-    // Data channel for receiving
-    m_task_t    data_task;          // receive buffer
-    msg_comm_t  data_comm;          // receive communication
-    bool        data_close_is_last; // do not rearm comm after next close
+    // Queue of received messages
+    std::queue<m_task_t> received;
 
-    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
+    mutex_t receiver_mutex;
+    condition_t receiver_cond;
+    m_process_t receiver_thread;
+    static int receiver_wrapper(int, char* []);
+    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);
 };