Use git diff instead of diff-index for setlocalversion.

[loba.git] / messages.h

diff --git a/messages.h b/messages.h
index 8de464ab8f390cb4fb77cc4a647b05f4d5e864e3..02859c975c05089442b8182b65978454ca1bf4e3 100644 (file)
--- a/messages.h
+++ b/messages.h
@@ -3,36 +3,40 @@
 
 #include <queue>
 #include <string>
 
 #include <queue>
 #include <string>

-#include <msg/msg.h>
+#include <simgrid/msg.h>
+#include "simgrid_features.h"

 #include "synchro.h"
 #include "sync_queue.h"
 
 class message {
 public:
 #include "synchro.h"
 #include "sync_queue.h"
 
 class message {
 public:

-    enum message_type { INFO, CREDIT, LOAD, CTRL_CLOSE, DATA_CLOSE };
+    enum class 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; }
 
     message_type get_type() const       { return type;   }
     double get_amount() const           { return amount; }

-    double get_size() const;
+    double get_credit() const           { return credit; }
+    double get_size() const             { return size;   }

 
     std::string to_string();
 
 private:
     message_type type;
     double amount;
 
     std::string to_string();
 
 private:
     message_type type;
     double amount;

+    double credit;
+    double size;

 };
 
 class message_queue {
 public:
     // Push a message on queue
 };
 
 class message_queue {
 public:
     // Push a message on queue

-    void push(m_task_t task);
+    void push(msg_task_t task);

 
     // Try to pop 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 pop a message.  Returns true on success.
     // Parameter "timeout" may be 0 for non-blocking operation, -1 for
     // infinite waiting, or any positive timeout.

-    bool pop(message*& msg, m_host_t& from, double timeout);
+    bool pop(message*& msg, msg_host_t& from, double timeout);

 
     bool empty() const                  { return queue.empty(); }
     size_t size() const                 { return queue.size();  }
 
     bool empty() const                  { return queue.empty(); }
     size_t size() const                 { return queue.size();  }


@@ -40,7 +44,7 @@ public:
 private:
     mutex_t mutex;
     condition_t cond;
 private:
     mutex_t mutex;
     condition_t cond;

-    sync_queue<m_task_t> queue;
+    sync_queue<msg_task_t> queue;

 };
 
 #endif // !MESSAGES_H
 };
 
 #endif // !MESSAGES_H