Add a VERSION file, for the distrib.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 2eed581f2bcab777938f898947112893105b4dca..93bdc4ee3ff8ba82925e8b72bbbf107d3e90cb7c 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -14,10 +14,10 @@ message::message(message_type t, double a, double c)
     // compute message size
     // arbitrary: 8 for type, and 8 for each double
     switch (type) {
     // compute message size
     // arbitrary: 8 for type, and 8 for each double
     switch (type) {

-    case INFO:
+    case CTRL:

         size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
         break;
         size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
         break;

-    case LOAD:
+    case DATA:

         size = 16 + opt::comm_cost(amount); // type + amount + data size
         break;
     default:
         size = 16 + opt::comm_cost(amount); // type + amount + data size
         break;
     default:


@@ -28,14 +28,30 @@ message::message(message_type t, double a, double c)
 
 std::string message::to_string()
 {
 
 std::string message::to_string()
 {

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

     std::ostringstream oss;
     std::ostringstream oss;

-    oss << str[type] << ": " << amount;
+    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();
 }
 
     return oss.str();
 }
 

-void message_queue::push(m_task_t task)
+void message_queue::push(msg_task_t task)

 {
     if (queue.push(task)) {
          // list was empty, the push must be signaled
 {
     if (queue.push(task)) {
          // list was empty, the push must be signaled


@@ -45,9 +61,9 @@ void message_queue::push(m_task_t task)
     }
 }
 
     }
 }
 

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

 {
 {

-    m_task_t task;
+    msg_task_t task;

     if (!queue.try_pop(task)) {
         if (timeout == 0.0)
             return false;
     if (!queue.try_pop(task)) {
         if (timeout == 0.0)
             return false;


@@ -56,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