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

diff --git a/communicator.h b/communicator.h
index f1ee1d9..ea096d6 100644
--- a/communicator.h
+++ b/communicator.h
@@ -4,45 +4,56 @@
 #define COMMUNICATOR_H
 
 #include <list>
-
+#include <string>
 #include <msg/msg.h>
-#include <xbt/sysdep.h>
-#include "neighbor.h"
+
+class message {
+public:
+    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; }
+
+private:
+    message_type type;
+    double amount;
+};
 
 class communicator {
 public:
     communicator();
     ~communicator();
 
-    void send_info(const neighbor& dest, double amount);
-    void send_credit(const neighbor& dest, double amount);
-    void send_load(const neighbor& dest, double amount);
+    void send(const char* dest, message* msg);
+    bool recv(message*& msg, m_host_t& from, bool wait);
+    void wait_for_sent();
 
-    bool recv_info(double& amount, m_host_t& from);
-    bool recv_credit(double& amount, m_host_t& from);
-    bool recv_load(double& amount, m_host_t& from);
+    void next_close_on_ctrl_is_last();
+    void next_close_on_data_is_last();
 
     int send_backlog();
 
 private:
-    enum message_type { INFO_MSG, CREDIT_MSG };
-    class message;
-
     // List of pending send communications
     std::list<msg_comm_t> sent_comm;
 
     // Control channel for receiving
-    char*       ctrl_mbox;
+    std::string ctrl_mbox;
     msg_comm_t  ctrl_comm;
     m_task_t    ctrl_task;
+    bool        ctrl_close_is_last;
 
     // Data channel for receiving
-    char*       data_mbox;
+    std::string data_mbox;
     msg_comm_t  data_comm;
     m_task_t    data_task;
+    bool        data_close_is_last;
 
-    bool recv_ctrl(message_type type, double& amount, m_host_t& from);
-    void send(const char* dest, m_task_t task);
+    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();
 };