Be consistent and hold mutex in any case when returning from condition_t::timedwait().

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index b04301ad87574aff718d3fc7b8539d1973183bab..8f3f6bf38e12fda60c6ddcc2f2373d691d816e6f 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -3,35 +3,12 @@
 #ifndef COMMUNICATOR_H
 #define COMMUNICATOR_H
 
 #ifndef COMMUNICATOR_H
 #define COMMUNICATOR_H
 

-#include <list>
-#include <queue>
-#include <string>
+#include <vector>

 #include <msg/msg.h>
 #include "hostdata.h"
 #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 };
-
-    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;
-};
+#include "messages.h"
+#include "msg_thread.h"
+#include "simgrid_features.h"

 
 class communicator {
 public:
 
 class communicator {
 public:


@@ -39,56 +16,59 @@ public:
     ~communicator();
 
     // Send a message to the "dest" mailbox
     ~communicator();
 
     // Send a message to the "dest" mailbox

-    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);
+    void ctrl_send(const char* dest, message* msg) {
+        ctrl_sent.push_back(real_send(dest, msg));
+    }
+    void data_send(const char* dest, message* msg) {
+        data_sent.push_back(real_send(dest, msg));
+    }

 
     // Try to flush pending sending communications.
     // If "wait" is true, blocks until success.
 
     // Try to flush pending sending communications.
     // If "wait" is true, blocks until success.

-    void flush(bool wait);
+    void ctrl_flush(bool wait) {
+        real_flush(ctrl_sent, wait);
+    }
+    void data_flush(bool wait) {
+        real_flush(data_sent, wait);
+    }
+
+    // Flush all sending_communications.  Blocking.
+    void flush_all();
+
+    // 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 ctrl_recv(message*& msg, msg_host_t& from, double timeout) {
+        return ctrl_received.pop(msg, from, timeout);
+    }
+    bool data_recv(message*& msg, msg_host_t& from, double timeout) {
+        return data_received.pop(msg, from, timeout);
+    }

 
 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
     // 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;
+    typedef std::vector<msg_comm_t> sent_comm_type;
+    sent_comm_type ctrl_sent;
+    sent_comm_type data_sent;

 
 

-    // Control channel for receiving
-    m_task_t    ctrl_task;          // receive buffer
-    msg_comm_t  ctrl_comm;          // receive communication
+    msg_comm_t real_send(const char* dest, message* msg);
+    void real_flush(sent_comm_type& sent_comm, bool wait);

 
 

-    // Data channel for receiving
-    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(); }
+    // Queues of received messages
+    message_queue ctrl_received;
+    message_queue data_received;

 
     // Handling of receiving thread
 
     // Handling of receiving thread

-    m_process_t receiver_process;
-    static int receiver_wrapper(int, char* []);
-    int receiver();
+    msg_thread* receiver_thread;
+    void receiver();

 
 

-    // Used to test if a communication is over, and to destroy it if it is
+    // 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);

-
-    // 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