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

diff --git a/communicator.h b/communicator.h
index ca0d3b2..cfe8624 100644
--- a/communicator.h
+++ b/communicator.h
@@ -4,27 +4,46 @@
 #define COMMUNICATOR_H
 
 #include <list>
-#include <string>
 #include <msg/msg.h>
+#include "hostdata.h"
+#include "messages.h"
+#include "msg_thread.h"
 
 class communicator {
 public:
     communicator();
     ~communicator();
 
-    void send(m_task_t task, const char *dest);
-    void send(m_task_t task, const std::string& dest);
-    m_task_t recv();
-    int sent_count();
+    // Send a message to the "dest" mailbox
+    void send(const char* dest, message* msg);
+
+    // 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);
 
 private:
-    typedef std::list<msg_comm_t> comm_list;
-    comm_list   sent_comm;
-    char*       recv_mbox;
-    msg_comm_t  recv_comm;
-    m_task_t    recv_task;
+    // Myself
+    const hostdata* host;
+
+    // List of pending send communications
+    std::list<msg_comm_t> sent_comm;
+
+    // Queue of received messages
+    message_queue received;
+
+    // Handling of receiving thread
+    msg_thread* receiver_thread;
+    void receiver();
 
-    void send_acknowledge();
+    // 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