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

diff --git a/communicator.h b/communicator.h
index c18b662..f9d096a 100644
--- a/communicator.h
+++ b/communicator.h
@@ -3,51 +3,50 @@
 #ifndef COMMUNICATOR_H
 #define COMMUNICATOR_H
 
-#include <list>
-#include <string>
+#include <vector>
 #include <msg/msg.h>
-
-class message {
-public:
-    enum message_type { INFO, CREDIT, LOAD, 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;
-};
+#include "hostdata.h"
+#include "messages.h"
+#include "msg_thread.h"
 
 class communicator {
 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);
 
-    int send_backlog();
+    // Try to flush pending sending communications.
+    // If "wait" is true, blocks until success.
+    void flush(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) {
+        return received.pop(msg, from, timeout);
+    }
 
 private:
+    // Myself
+    const hostdata* host;
+
     // List of pending send communications
-    std::list<msg_comm_t> sent_comm;
+    typedef std::vector<msg_comm_t> sent_comm_type;
+    sent_comm_type sent_comm;
 
-    // Control channel for receiving
-    std::string ctrl_mbox;
-    msg_comm_t  ctrl_comm;
-    m_task_t    ctrl_task;
+    // Queue of received messages
+    message_queue received;
 
-    // Data channel for receiving
-    std::string data_mbox;
-    msg_comm_t  data_comm;
-    m_task_t    data_task;
+    // Handling of receiving thread
+    msg_thread* receiver_thread;
+    void receiver();
 
-    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();
+    // 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);
 };
 
 #endif // !COMMUNICATOR_H