xbt_cond_timedwait has changed and doesn't throw exception anymore.

[loba.git] / synchro.h

diff --git a/synchro.h b/synchro.h
index e366bee20adb8175c09814742b420a1ef25b479d..bd49783ccdc943f2710ed76f9e4e60787fb0b5cf 100644 (file)
--- a/synchro.h
+++ b/synchro.h
@@ -1,7 +1,7 @@
 #ifndef SYNCHRO_H
 #define SYNCHRO_H
 
 #ifndef SYNCHRO_H
 #define SYNCHRO_H
 

-#include <xbt/synchro_core.h>
+#include <xbt/synchro.h>

 
 class mutex_t {
 public:
 
 class mutex_t {
 public:


@@ -23,8 +23,12 @@ 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) {
+        if (xbt_cond_timedwait(cond, mutex.mutex, delay)) {
+            mutex.acquire();
+            return false;       // got a timeout
+        }
+        return true;

     }
 
 private:
     }
 
 private: