Handle timeout exception in condition_t::timedwait().

diff --git a/messages.cpp b/messages.cpp
index 547a29f6e26d56bc95ab5d2ee2d8a63bf5cd2fb9..6c9f3ec0402f3c357676f2bd53be29a83207c096 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -70,19 +70,12 @@ bool message_queue::pop(message*& msg, msg_host_t& from, double timeout)
 
         mutex.acquire();
         if (!queue.try_pop(task)) {
 
         mutex.acquire();
         if (!queue.try_pop(task)) {

-            xbt_ex_t e;

             XBT_DEBUG("waiting for a message to come");
             XBT_DEBUG("waiting for a message to come");

-            TRY {
-                if (timeout > 0)
-                    cond.timedwait(mutex, timeout);
-                else
-                    cond.wait(mutex);
-            }
-            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);
             }
             bool pop_was_successful = queue.try_pop(task);
             xbt_assert(pop_was_successful);

diff --git a/synchro.h b/synchro.h
index e366bee20adb8175c09814742b420a1ef25b479d..45e0901cac01d9343c48192ba1799fa15ac89c63 100644 (file)
--- a/synchro.h
+++ b/synchro.h
@@ -23,8 +23,18 @@ public:
     void broadcast()            { xbt_cond_broadcast(cond);         }
     void signal()               { xbt_cond_signal(cond);            }
     void wait(mutex_t& mutex)   { xbt_cond_wait(cond, mutex.mutex); }
     void broadcast()            { xbt_cond_broadcast(cond);         }
     void signal()               { xbt_cond_signal(cond);            }
     void wait(mutex_t& mutex)   { xbt_cond_wait(cond, mutex.mutex); }

-    void timedwait(mutex_t& mutex, double delay) {
-        xbt_cond_timedwait(cond, mutex.mutex, delay);
+    bool timedwait(mutex_t& mutex, double delay) {
+        xbt_ex_t e;
+        TRY {
+            xbt_cond_timedwait(cond, mutex.mutex, delay);
+        }
+        CATCH (e) {
+            if (e.category != timeout_error)
+                RETHROW;
+            xbt_ex_free(e);
+            return false;       // got a timeout
+        }
+        return true;

     }
 
 private:
     }
 
 private: