Wip++...

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index c18b662410b7614c4e6d8877d3b44c1aa8967c21..ea096d60e974f33ab909cb3cf38dbcfa27f2c624 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -9,7 +9,7 @@
 
 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(message_type t, double a): type(t), amount(a) { }
 


@@ -27,7 +27,11 @@ public:
     ~communicator();
 
     void send(const char* dest, message* msg);
     ~communicator();
 
     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 wait_for_sent();
+
+    void next_close_on_ctrl_is_last();
+    void next_close_on_data_is_last();

 
     int send_backlog();
 
 
     int send_backlog();
 


@@ -39,14 +43,17 @@ private:
     std::string ctrl_mbox;
     msg_comm_t  ctrl_comm;
     m_task_t    ctrl_task;
     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;
 
     // 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(); }
 
     const char* get_ctrl_mbox() const   { return ctrl_mbox.c_str(); }
     const char* get_data_mbox() const   { return data_mbox.c_str(); }

+    static bool comm_test_n_destroy(msg_comm_t& comm);

     void flush_sent();
 };
 
     void flush_sent();
 };