X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4e922bca67d7cf4bc30a878cd7cd46d39fbe1573..8b38487ddaa9feb357243d58db9cb5403d758262:/communicator.h?ds=inline diff --git a/communicator.h b/communicator.h index 66dc800..b79210c 100644 --- a/communicator.h +++ b/communicator.h @@ -3,27 +3,11 @@ #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: @@ -31,48 +15,58 @@ public: ~communicator(); // Send a message to the "dest" mailbox - void send(const char* dest, message* msg); + 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. + 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 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); + bool ctrl_recv(message*& msg, m_host_t& from, double timeout) { + return ctrl_received.pop(msg, from, timeout); + } + bool data_recv(message*& msg, m_host_t& from, double timeout) { + return data_received.pop(msg, from, 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; - - // 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 + typedef std::vector<msg_comm_t> sent_comm_type; + sent_comm_type ctrl_sent; + sent_comm_type data_sent; - // Data channel for receiving - m_task_t data_task; // receive buffer - msg_comm_t data_comm; // receive communication + msg_comm_t real_send(const char* dest, message* msg); + void real_flush(sent_comm_type& sent_comm, bool wait); - 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 - 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); };