Check if communications are successfull.

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index fb06d3448be6f7710e365ace3a0c60ea61bd6450..091594fe8f6bf36af3e39bf058593a6ea9f83759 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -4,6 +4,7 @@
 #define COMMUNICATOR_H
 
 #include <list>
 #define COMMUNICATOR_H
 
 #include <list>

+#include <queue>

 #include <string>
 #include <msg/msg.h>
 #include "hostdata.h"
 #include <string>
 #include <msg/msg.h>
 #include "hostdata.h"


@@ -29,14 +30,17 @@ public:
     communicator();
     ~communicator();
 
     communicator();
     ~communicator();
 

-    void listen();
-
+    // Send a message to the "dest" mailbox

     void send(const char* dest, message* msg);
     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();
+    // 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 recv(message*& msg, m_host_t& from, double timeout);
+
+    // Try to flush pending sending communications.
+    // If "wait" is true, blocks until success.
+    void flush(bool wait);

 
 private:
     // Myself
 
 private:
     // Myself


@@ -44,22 +48,32 @@ private:
 
     // List of pending send communications
     std::list<msg_comm_t> sent_comm;
 
     // List of pending send communications
     std::list<msg_comm_t> sent_comm;

-    static const int send_count_before_flush;
-    int send_counter;
+
+    // Queue of received messages
+    std::queue<m_task_t> received;

 
     // Control channel for receiving
 
     // Control channel for receiving

-    m_task_t    ctrl_task;
-    msg_comm_t  ctrl_comm;
-    bool        ctrl_close_is_last;
+    m_task_t    ctrl_task;          // receive buffer
+    msg_comm_t  ctrl_comm;          // receive communication

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

-    m_task_t    data_task;
-    msg_comm_t  data_comm;
-    bool        data_close_is_last;
+    m_task_t    data_task;          // receive buffer
+    msg_comm_t  data_comm;          // receive communication

 
     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 host->get_ctrl_mbox(); }
     const char* get_data_mbox() const   { return host->get_data_mbox(); }
 

+    // Handling of receiving thread
+    xbt_mutex_t receiver_mutex;
+    xbt_cond_t receiver_cond;
+    m_process_t receiver_thread;
+    static int receiver_wrapper(int, char* []);
+    void receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox);
+    void receiver();
+
+    // 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);
 };
 
     static bool comm_test_n_destroy(msg_comm_t comm);
 };