Factorize computation of load_to_send.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 025871a12f8f1e4bce39d3674108bee40e9dbed1..fd19f6b979657881f082d09e7bc0ea8a480a3ac2 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -8,24 +8,33 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "messages.h"
 
 
 #include "messages.h"
 

+message::message(message_type t, double a, double c)
+    : type(t), amount(a) , credit(c)
+{
+    // compute message size
+    // arbitrary: 8 for type, and 8 for each double
+    switch (type) {
+    case CTRL:
+        size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
+        break;
+    case DATA:
+        size = 16 + opt::comm_cost(amount); // type + amount + data size
+        break;
+    default:
+        size = 8;               // type
+        break;
+    }
+}
+

 std::string message::to_string()
 {
 std::string message::to_string()
 {

-    static const char* str[] = { "INFO", "CREDIT", "LOAD",
-                                 "CTRL_CLOSE", "DATA_CLOSE" };
+    static const char* str[DATA_CLOSE + 1] = { "CTRL", "DATA",
+                                               "CTRL_CLOSE", "DATA_CLOSE" };

     std::ostringstream oss;
     oss << str[type] << ": " << amount;
     return oss.str();
 }
 
     std::ostringstream oss;
     oss << str[type] << ": " << amount;
     return oss.str();
 }
 

-double message::get_size() const
-{
-    // arbitrary: 8 for type, and 8 for amount
-    double size = 16;
-    if (type == LOAD)
-        size += opt::comm_cost(amount);
-    return size;
-}
-

 void message_queue::push(m_task_t task)
 {
     if (queue.push(task)) {
 void message_queue::push(m_task_t task)
 {
     if (queue.push(task)) {