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

diff --git a/communicator.h b/communicator.h
index 4e0757a..c123b1b 100644
--- a/communicator.h
+++ b/communicator.h
@@ -3,62 +3,71 @@
 #ifndef COMMUNICATOR_H
 #define COMMUNICATOR_H
 
-#include <list>
-#include <string>
-#include <msg/msg.h>
+#include <vector>
+#include <simgrid/msg.h>
 #include "hostdata.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; }
-
-    std::string to_string();
-
-private:
-    message_type type;
-    double amount;
-};
+#include "messages.h"
+#include "msg_thread.h"
+#include "simgrid_features.h"
 
 class communicator {
 public:
     communicator();
     ~communicator();
 
-    void listen();
-
-    void send(const char* dest, message* msg);
-    bool recv(message*& msg, m_host_t& from, bool wait);
-    void flush(bool wait);
-
-    void next_close_on_ctrl_is_last();
-    void next_close_on_data_is_last();
+    // 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);
+    }
+
+    // Flush all sending_communications.  Blocking.
+    void flush_all();
+
+    // 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:
     // 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;
 
-    // Control channel for receiving
-    m_task_t    ctrl_task;
-    msg_comm_t  ctrl_comm;
-    bool        ctrl_close_is_last;
+    msg_comm_t real_send(const char* dest, message* msg);
+    void real_flush(sent_comm_type& sent_comm, bool wait);
 
-    // Data channel for receiving
-    m_task_t    data_task;
-    msg_comm_t  data_comm;
-    bool        data_close_is_last;
+    // Queues of received messages
+    message_queue ctrl_received;
+    message_queue data_received;
 
-    const char* get_ctrl_mbox() const   { return host->get_ctrl_mbox(); }
-    const char* get_data_mbox() const   { return host->get_data_mbox(); }
+    // Handling of receiving thread
+    msg_thread* receiver_thread;
+    void receiver();
 
-    static void comm_push_in_dynar(xbt_dynar_t dynar, msg_comm_t comm);
+    // 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);
 };