#ifndef COMMUNICATOR_H
#define COMMUNICATOR_H
-#include <list>
-#include <queue>
-#include <string>
+#include <vector>
#include <msg/msg.h>
#include "hostdata.h"
-
-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 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);
- // Try to flush pending sending communications.
- // If "wait" is true, blocks until success.
- void flush(bool wait);
-
private:
// Myself
const hostdata* host;
// List of pending send communications
- std::list<msg_comm_t> sent_comm;
+ typedef std::vector<msg_comm_t> sent_comm_type;
+ sent_comm_type sent_comm;
// Queue of received messages
- std::queue<m_task_t> received;
+ message_queue received;
// 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* []);
+ msg_thread* receiver_thread;
void receiver();
// Used to chek if a communication is successfull before destroying it
