X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/fc5dcac1115a7112e7ad9d67ce7fe233790e0887..7c16f589594608d2269921e11d5298c09fe2512b:/communicator.h

diff --git a/communicator.h b/communicator.h
index ea096d6..66dc800 100644
--- a/communicator.h
+++ b/communicator.h
@@ -4,8 +4,10 @@
 #define COMMUNICATOR_H
 
 #include <list>
+#include <queue>
 #include <string>
 #include <msg/msg.h>
+#include "hostdata.h"
 
 class message {
 public:
@@ -16,6 +18,8 @@ public:
     message_type get_type() const       { return type;   }
     double get_amount() const           { return amount; }
 
+    std::string to_string();
+
 private:
     message_type type;
     double amount;
@@ -26,35 +30,50 @@ public:
     communicator();
     ~communicator();
 
+    // Send a message to the "dest" mailbox
     void send(const char* dest, message* msg);
-    bool recv(message*& msg, m_host_t& from, bool wait);
-    void wait_for_sent();
 
-    void next_close_on_ctrl_is_last();
-    void next_close_on_data_is_last();
+    // 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);
 
-    int send_backlog();
+    // Try to flush pending sending communications.
+    // If "wait" is true, blocks until success.
+    void flush(bool wait);
 
 private:
+    // 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;
 
+    // Queue of received messages
+    std::queue<m_task_t> received;
+
     // Control channel for receiving
-    std::string ctrl_mbox;
-    msg_comm_t  ctrl_comm;
-    m_task_t    ctrl_task;
-    bool        ctrl_close_is_last;
+    m_task_t    ctrl_task;          // receive buffer
+    msg_comm_t  ctrl_comm;          // receive communication
 
     // Data channel for receiving
-    std::string data_mbox;
-    msg_comm_t  data_comm;
-    m_task_t    data_task;
-    bool        data_close_is_last;
-
-    const char* get_ctrl_mbox() const   { return ctrl_mbox.c_str(); }
-    const char* get_data_mbox() const   { return data_mbox.c_str(); }
-    static bool comm_test_n_destroy(msg_comm_t& comm);
-    void flush_sent();
+    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
+    m_process_t receiver_process;
+    static int receiver_wrapper(int, char* []);
+    int 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);
 };
 
 #endif // !COMMUNICATOR_H