X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/6f5ec5fdc42f96a8fe95f4b846b163d4dc92e0c8..4d5ec9803b74d0f3e9c002a92a748bd08b6640ac:/communicator.h

diff --git a/communicator.h b/communicator.h
index f1ee1d9..c123b1b 100644
--- a/communicator.h
+++ b/communicator.h
@@ -3,47 +3,72 @@
 #ifndef COMMUNICATOR_H
 #define COMMUNICATOR_H
 
-#include <list>
-
-#include <msg/msg.h>
-#include <xbt/sysdep.h>
-#include "neighbor.h"
+#include <vector>
+#include <simgrid/msg.h>
+#include "hostdata.h"
+#include "messages.h"
+#include "msg_thread.h"
+#include "simgrid_features.h"
 
 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);
+    // Send a message to the "dest" mailbox
+    void ctrl_send(const char* dest, message* msg) {
+        ctrl_sent.push_back(real_send(dest, msg));
+    }
+    void data_send(const char* dest, message* msg) {
+        data_sent.push_back(real_send(dest, msg));
+    }
+
+    // Try to flush pending sending communications.
+    // If "wait" is true, blocks until success.
+    void ctrl_flush(bool wait) {
+        real_flush(ctrl_sent, wait);
+    }
+    void data_flush(bool wait) {
+        real_flush(data_sent, wait);
+    }
 
-    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);
+    // Flush all sending_communications.  Blocking.
+    void flush_all();
 
-    int send_backlog();
+    // 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 ctrl_recv(message*& msg, msg_host_t& from, double timeout) {
+        return ctrl_received.pop(msg, from, timeout);
+    }
+    bool data_recv(message*& msg, msg_host_t& from, double timeout) {
+        return data_received.pop(msg, from, timeout);
+    }
 
 private:
-    enum message_type { INFO_MSG, CREDIT_MSG };
-    class message;
+    // 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 ctrl_sent;
+    sent_comm_type data_sent;
+
+    msg_comm_t real_send(const char* dest, message* msg);
+    void real_flush(sent_comm_type& sent_comm, bool wait);
 
-    // Control channel for receiving
-    char*       ctrl_mbox;
-    msg_comm_t  ctrl_comm;
-    m_task_t    ctrl_task;
+    // Queues of received messages
+    message_queue ctrl_received;
+    message_queue data_received;
 
-    // Data channel for receiving
-    char*       data_mbox;
-    msg_comm_t  data_comm;
-    m_task_t    data_task;
+    // Handling of receiving thread
+    msg_thread* receiver_thread;
+    void receiver();
 
-    bool recv_ctrl(message_type type, double& amount, m_host_t& from);
-    void send(const char* dest, m_task_t task);
-    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