Handle timeout exception in condition_t::timedwait().

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 93bdc4ee3ff8ba82925e8b72bbbf107d3e90cb7c..6c9f3ec0402f3c357676f2bd53be29a83207c096 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -70,28 +70,17 @@ bool message_queue::pop(message*& msg, msg_host_t& from, double timeout)
 
         mutex.acquire();
         if (!queue.try_pop(task)) {
-            xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");
-            TRY_FAST {
-                if (timeout > 0)
-                    cond.timedwait(mutex, timeout);
-                else
-                    cond.wait(mutex);
-            }
-            TRY_CLEANUP {
-                mutex.release();
-            }
-            CATCH (e) {
-                if (e.category != timeout_error)
-                    RETHROW;
-                xbt_ex_free(e);
-                return false;   // got a timeout
+            if (timeout > 0) {
+                if (!cond.timedwait(mutex, timeout))
+                    return false;
+            } else {
+                cond.wait(mutex);
             }
             bool pop_was_successful = queue.try_pop(task);
             xbt_assert(pop_was_successful);
-        } else {
-            mutex.release();
         }
+        mutex.release();
     }
     msg = static_cast<message*>(MSG_task_get_data(task));
     from = MSG_task_get_source(task);