API change in SimGrid 3.8: MSG_global_init -> MSG_init.

[loba.git] / messages.h

diff --git a/messages.h b/messages.h
index 70d675da7994f971efc41aca6bc4844f810a85ad..1886301fc1560c835551c6cc7e4774787292df46 100644 (file)
--- a/messages.h
+++ b/messages.h
@@ -5,21 +5,26 @@
 #include <string>
 #include <msg/msg.h>
 #include "synchro.h"
+#include "sync_queue.h"
 
 class message {
 public:
-    enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };
+    enum message_type { CTRL, DATA, CTRL_CLOSE, DATA_CLOSE };
 
-    message(message_type t, double a): type(t), amount(a) { }
+    message(message_type t, double a, double c = 0.0);
 
     message_type get_type() const       { return type;   }
     double get_amount() const           { return amount; }
+    double get_credit() const           { return credit; }
+    double get_size() const             { return size;   }
 
     std::string to_string();
 
 private:
     message_type type;
     double amount;
+    double credit;
+    double size;
 };
 
 class message_queue {
@@ -38,7 +43,7 @@ public:
 private:
     mutex_t mutex;
     condition_t cond;
-    std::queue<m_task_t> queue;
+    sync_queue<m_task_t> queue;
 };
 
 #endif // !MESSAGES_H