X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/3634a92de5281a6b19ca03b49b21dad853f386b3..HEAD:/synchro.h?ds=inline diff --git a/synchro.h b/synchro.h index 45e0901..bd49783 100644 --- a/synchro.h +++ b/synchro.h @@ -1,7 +1,7 @@ #ifndef SYNCHRO_H #define SYNCHRO_H -#include +#include class mutex_t { public: @@ -24,14 +24,8 @@ public: void signal() { xbt_cond_signal(cond); } void wait(mutex_t& mutex) { xbt_cond_wait(cond, mutex.mutex); } 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); + if (xbt_cond_timedwait(cond, mutex.mutex, delay)) { + mutex.acquire(); return false; // got a timeout } return true;