Temporarily use opt::option_x in algorithms (2)besteffort.

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index 7cb1efcb0883374084f9aeb872b5a2fad1bd96b6..b79210ca7d78dfb365bf276d7788c7f8316b2140 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -3,11 +3,11 @@
 #ifndef COMMUNICATOR_H
 #define COMMUNICATOR_H
 
 #ifndef COMMUNICATOR_H
 #define COMMUNICATOR_H
 

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

 #include <msg/msg.h>
 #include "hostdata.h"
 #include "messages.h"
 #include <msg/msg.h>
 #include "hostdata.h"
 #include "messages.h"

-#include "synchro.h"
+#include "msg_thread.h"

 
 class communicator {
 public:
 
 class communicator {
 public:


@@ -15,32 +15,53 @@ public:
     ~communicator();
 
     // Send a message to the "dest" mailbox
     ~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.
 
     // 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.
 
     // 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);
+    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;
 
     // List of pending send communications
 
 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 ctrl_sent;
+    sent_comm_type data_sent;
+
+    msg_comm_t real_send(const char* dest, message* msg);
+    void real_flush(sent_comm_type& sent_comm, bool wait);

 
 

-    // Queue of received messages
-    message_queue received;
+    // Queues of received messages
+    message_queue ctrl_received;
+    message_queue data_received;

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

-    mutex_t receiver_mutex;
-    condition_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
     void receiver();
 
     // Used to chek if a communication is successfull before destroying it