Remove useless temporary references.

[loba.git] / messages.cpp

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

-std::string message::to_string()
+message::message(message_type t, double a, double c)
+    : type(t), amount(a) , credit(c)

 {
 {

-    static const char* str[] = { "INFO", "CREDIT", "LOAD",
-                                 "CTRL_CLOSE", "DATA_CLOSE" };
-    std::ostringstream oss;
-    oss << str[type] << ": " << amount;
-    return oss.str();
+    // 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;
+    }

 }
 
 }
 

-double message::get_size() const
+std::string message::to_string()

 {
 {

-    // arbitrary: 8 for type, and 8 for amount
-    double size = 16;
-    if (type == LOAD)
-        size += opt::comm_cost(amount);
-    return size;
+    std::ostringstream oss;
+    switch (type) {
+    case CTRL:
+        oss << "CTRL: " << amount << " (info)";
+        if (opt::bookkeeping)
+            oss << "; " << credit << " (credit)";
+        break;
+    case DATA:
+        oss << "DATA: " << amount << " (load)";
+        break;
+    case CTRL_CLOSE:
+        oss << "CTRL_CLOSE";
+        break;
+    case DATA_CLOSE:
+        oss << "DATA_CLOSE";
+        break;
+    default:
+        oss << "UNKNOWN MESSAGE TYPE: " << type;
+        break;
+    }
+    return oss.str();

 }
 
 void message_queue::push(m_task_t task)
 }
 
 void message_queue::push(m_task_t task)


@@ -47,7 +72,7 @@ bool message_queue::pop(message*& msg, m_host_t& from, double timeout)
         if (!queue.try_pop(task)) {
             xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");
         if (!queue.try_pop(task)) {
             xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");

-            TRY {
+            TRY_FAST {

                 if (timeout > 0)
                     cond.timedwait(mutex, timeout);
                 else
                 if (timeout > 0)
                     cond.timedwait(mutex, timeout);
                 else