Add a VERSION file, for the distrib.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 2d5de949b0ddd72a05d2661ae81b0234018bdde7..93bdc4ee3ff8ba82925e8b72bbbf107d3e90cb7c 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -51,7 +51,7 @@ std::string message::to_string()
     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


@@ -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;
     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");
         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