Move some debugging messages.

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index 4e0757a2dccce15627c3cc13b3a201437d50ef06..b04301ad87574aff718d3fc7b8539d1973183bab 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -4,10 +4,19 @@
 #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"
 

+// Cannot include "options.h" without error, so only declare the
+// needed functions.
+namespace opt {
+    bool parse_args(int* argc, char* argv[]);
+    void print();
+    void usage();
+}
+

 class message {
 public:
     enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };
 class message {
 public:
     enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };


@@ -29,37 +38,57 @@ 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);

+
+    // Try to get a message.  Returns true on success.
+    // If "wait" is true, blocks until success.

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

 
 private:
     // Myself
     const hostdata* host;
 
 
 private:
     // Myself
     const hostdata* host;
 

+    // Used to synchronize main and receiver thread 
+    xbt_mutex_t mutex;
+    xbt_cond_t cond;
+

     // 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 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(); }
 

-    static void comm_push_in_dynar(xbt_dynar_t dynar, msg_comm_t comm);
+    // Handling of receiving thread
+    m_process_t receiver_process;
+    static int receiver_wrapper(int, char* []);
+    int receiver();
+
+    // Used to test if a communication is over, and to destroy it if it is

     static bool comm_test_n_destroy(msg_comm_t comm);
     static bool comm_test_n_destroy(msg_comm_t comm);

+
+    // Make opt::* functions our friends to provide them an access to
+    // send_count_before_flush
+    friend bool opt::parse_args(int*, char* []);
+    friend void opt::print();
+    friend void opt::usage();

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