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

diff --git a/communicator.h b/communicator.h
index c18b662..1e01677 100644
--- a/communicator.h
+++ b/communicator.h
@@ -9,13 +9,15 @@
 
 class message {
 public:
-    enum message_type { INFO, CREDIT, LOAD, CLOSE };
+    enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };
 
     message(message_type t, double a): type(t), amount(a) { }
 
     message_type get_type() const       { return type;   }
     double get_amount() const           { return amount; }
 
+    std::string to_string();
+
 private:
     message_type type;
     double amount;
@@ -26,10 +28,14 @@ public:
     communicator();
     ~communicator();
 
+    void listen();
+
     void send(const char* dest, message* msg);
-    bool recv(message*& msg, m_host_t& from);
+    bool recv(message*& msg, m_host_t& from, bool wait);
+    void flush(bool wait);
 
-    int send_backlog();
+    void next_close_on_ctrl_is_last();
+    void next_close_on_data_is_last();
 
 private:
     // List of pending send communications
@@ -39,15 +45,19 @@ private:
     std::string ctrl_mbox;
     msg_comm_t  ctrl_comm;
     m_task_t    ctrl_task;
+    bool        ctrl_close_is_last;
 
     // 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(); }
-    void flush_sent();
+
+    static void comm_push_in_dynar(xbt_dynar_t dynar, msg_comm_t comm);
+    static bool comm_test_n_destroy(msg_comm_t comm);
 };
 
 #endif // !COMMUNICATOR_H