Wip++...

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index c18b662410b7614c4e6d8877d3b44c1aa8967c21..4e0757a2dccce15627c3cc13b3a201437d50ef06 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -6,16 +6,19 @@
 #include <list>
 #include <string>
 #include <msg/msg.h>
 #include <list>
 #include <string>
 #include <msg/msg.h>

+#include "hostdata.h"

 
 class message {
 public:
 
 class message {
 public:

-    enum message_type { INFO, CREDIT, LOAD, CLOSE };
+    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; }
 
 
     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;
 private:
     message_type type;
     double amount;


@@ -26,28 +29,37 @@ public:
     communicator();
     ~communicator();
 
     communicator();
     ~communicator();
 

+    void listen();
+

     void send(const char* dest, message* msg);
     void send(const char* dest, message* msg);

-    bool recv(message*& msg, m_host_t& from);
+    bool recv(message*& msg, m_host_t& from, bool wait);
+    void flush(bool wait);

 
 

-    int send_backlog();
+    void next_close_on_ctrl_is_last();
+    void next_close_on_data_is_last();

 
 private:
 
 private:

+    // Myself
+    const hostdata* host;
+

     // List of pending send communications
     std::list<msg_comm_t> sent_comm;
 
     // Control channel for receiving
     // 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;
     m_task_t    ctrl_task;

+    msg_comm_t  ctrl_comm;
+    bool        ctrl_close_is_last;

 
     // Data channel for receiving
 
     // Data channel for receiving

-    std::string data_mbox;
-    msg_comm_t  data_comm;

     m_task_t    data_task;
     m_task_t    data_task;

+    msg_comm_t  data_comm;
+    bool        data_close_is_last;
+
+    const char* get_ctrl_mbox() const   { return host->get_ctrl_mbox(); }
+    const char* get_data_mbox() const   { return host->get_data_mbox(); }

 
 

-    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();
+    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