Use git diff instead of diff-index for setlocalversion.

[loba.git] / communicator.h

diff --git a/communicator.h b/communicator.h
index ce74f077f5b86e33af81d6a91e96d181d34fa558..c123b1b5466e2f1448474bf3e899c0beb7ae7296 100644 (file)
--- a/communicator.h
+++ b/communicator.h
@@ -4,10 +4,11 @@
 #define COMMUNICATOR_H
 
 #include <vector>
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 #include "hostdata.h"
 #include "messages.h"
 #include "msg_thread.h"
+#include "simgrid_features.h"
 
 class communicator {
 public:
@@ -15,16 +16,34 @@ 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 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 recv(message*& msg, m_host_t& from, double 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
@@ -32,10 +51,15 @@ private:
 
     // List of pending send communications
     typedef std::vector<msg_comm_t> sent_comm_type;
-    sent_comm_type sent_comm;
+    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
     msg_thread* receiver_thread;