Wip++...

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index ca0d3b2031c5b092078a82a75b4f682167fc46a7..1e0167760dc545e3226041a655fd01728c96dbf3 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -7,24 +7,57 @@
 #include <string>
 #include <msg/msg.h>
 
 #include <string>
 #include <msg/msg.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;
+};
+

 class communicator {
 public:
     communicator();
     ~communicator();
 
 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();
+    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();

 
 private:
 
 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;
+    // List of pending send communications
+    std::list<msg_comm_t> sent_comm;
+
+    // Control channel for receiving
+    std::string ctrl_mbox;
+    msg_comm_t  ctrl_comm;
+    m_task_t    ctrl_task;
+    bool        ctrl_close_is_last;
+
+    // Data channel for receiving
+    std::string data_mbox;
+    msg_comm_t  data_comm;
+    m_task_t    data_task;
+    bool        data_close_is_last;
+
+    const char* get_ctrl_mbox() const   { return ctrl_mbox.c_str(); }
+    const char* get_data_mbox() const   { return data_mbox.c_str(); }

 
 

-    void send_acknowledge();
+    static void comm_push_in_dynar(xbt_dynar_t dynar, msg_comm_t comm);
+    static bool comm_test_n_destroy(msg_comm_t comm);

 };
 
 #endif // !COMMUNICATOR_H
 };
 
 #endif // !COMMUNICATOR_H