-void s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout) {
- simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
+std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout) {
+ try {
+ simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
+ return std::cv_status::timeout;
+ }
+ catch (xbt_ex& e) {
+ if (e.category == timeout_error) {
+ // We have to take the lock:
+ try {
+ lock.mutex()->lock();
+ }
+ catch (...) {
+ std::terminate();
+ }
+ return std::cv_status::timeout;
+ }
+ std::terminate();
+ }
+ catch (...) {
+ std::terminate();
+ }