#ifndef COMMUNICATOR_H
#define COMMUNICATOR_H
-#include <list>
-#include <queue>
-#include <string>
+#include <vector>
#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"
class communicator {
public:
// 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);
-
// Try to flush pending sending communications.
// If "wait" is true, blocks until success.
void flush(bool wait);
+ // 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);
+
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;
- static int send_count_before_flush;
- int send_counter;
+ typedef std::vector<msg_comm_t> sent_comm_type;
+ sent_comm_type sent_comm;
// Queue of received messages
- std::queue<m_task_t> received;
-
- // Control channel for receiving
- m_task_t ctrl_task; // receive buffer
- msg_comm_t ctrl_comm; // receive communication
-
- // 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(); }
+ message_queue received;
// 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);
-
- // 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
