Update ag_parameters after last discussion.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index c542596543ddd71ecd3280cb66560ff7c416744d..e9fbced1c63d659bc9dd358980eca2ff1bda858e 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -36,7 +36,7 @@ std::string message::to_string()
             oss << "; " << credit << " (credit)";
         break;
     case DATA:
             oss << "; " << credit << " (credit)";
         break;
     case DATA:

-       oss << "DATA: " << amount << " (load)";
+        oss << "DATA: " << amount << " (load)";

         break;
     case CTRL_CLOSE:
         oss << "CTRL_CLOSE";
         break;
     case CTRL_CLOSE:
         oss << "CTRL_CLOSE";


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