Save notes for pstar.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 93bdc4ee3ff8ba82925e8b72bbbf107d3e90cb7c..70e2236198839f8d53a56b918483646658b7fe66 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -63,36 +63,29 @@ void message_queue::push(msg_task_t task)
 
 bool message_queue::pop(message*& msg, msg_host_t& from, double timeout)
 {
-    msg_task_t task;
+    msg_task_t task = nullptr;
     if (!queue.try_pop(task)) {
         if (timeout == 0.0)
             return false;
 
         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
+            bool hit_timeout;
+            if (timeout > 0) {
+                hit_timeout = !cond.timedwait(mutex, timeout);
+            } else {
+                cond.wait(mutex);
+                hit_timeout = false;
             }
             bool pop_was_successful = queue.try_pop(task);
-            xbt_assert(pop_was_successful);
-        } else {
-            mutex.release();
+            xbt_assert(hit_timeout || pop_was_successful);
         }
+        mutex.release();
     }
+    if (task == nullptr)
+        return false;
+
     msg = static_cast<message*>(MSG_task_get_data(task));
     from = MSG_task_get_source(task);
     MSG_task_destroy(task);