X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/68a5f658c68d3637a503f608394d398d1ba3855f..01d46f8470e36e1823d897496e0d915770bc867b:/messages.cpp

diff --git a/messages.cpp b/messages.cpp
index c542596..93bdc4e 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -36,7 +36,7 @@ std::string message::to_string()
             oss << "; " << credit << " (credit)";
         break;
     case DATA:
-	oss << "DATA: " << amount << " (load)";
+        oss << "DATA: " << amount << " (load)";
         break;
     case CTRL_CLOSE:
         oss << "CTRL_CLOSE";
@@ -51,7 +51,7 @@ std::string message::to_string()
     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
@@ -61,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;
@@ -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");
-            TRY {
+            TRY_FAST {
                 if (timeout > 0)
                     cond.timedwait(mutex, timeout);
                 else