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

diff --git a/communicator.h b/communicator.h
index ea096d6..465d0cf 100644
--- a/communicator.h
+++ b/communicator.h
@@ -6,6 +6,7 @@
 #include <list>
 #include <string>
 #include <msg/msg.h>
+#include "hostdata.h"
 
 class message {
 public:
@@ -16,6 +17,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 +29,50 @@ 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);
-    void wait_for_sent();
 
+    // 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();
 
-    int send_backlog();
-
 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
-    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
+    bool        ctrl_close_is_last; // do not rearm comm after next close
 
     // 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
+    bool        data_close_is_last; // do not rearm comm after next close
+
+    const char* get_ctrl_mbox() const   { return host->get_ctrl_mbox(); }
+    const char* get_data_mbox() const   { return host->get_data_mbox(); }
+
+    // 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