+#include <exception>
+#include <mutex>
+
+#include <xbt/log.hpp>
+
#include "simgrid/s4u/conditionVariable.hpp"
#include "simgrid/simix.h"
-using namespace simgrid;
+namespace simgrid {
+namespace s4u {
-s4u::ConditionVariable::ConditionVariable() : cond_(simcall_cond_init()){
+ConditionVariable::ConditionVariable() : cond_(simcall_cond_init()){
}
-s4u::ConditionVariable::~ConditionVariable() {
+ConditionVariable::~ConditionVariable() {
SIMIX_cond_unref(cond_);
}
/**
* Wait functions
*/
-void s4u::ConditionVariable::wait(s4u::Mutex *mutex) {
- simcall_cond_wait(cond_, mutex->mutex_);
+void ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
+ simcall_cond_wait(cond_, lock.mutex()->mutex_);
}
-
-void s4u::ConditionVariable::wait_for(s4u::Mutex *mutex, double timeout) {
- simcall_cond_wait_timeout(cond_, 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::no_timeout;
+ }
+ catch (xbt_ex& e) {
+
+ // If the exception was a timeout, we have to take the lock again:
+ if (e.category == timeout_error) {
+ try {
+ lock.mutex()->lock();
+ return std::cv_status::timeout;
+ }
+ catch (...) {
+ std::terminate();
+ }
+ }
+
+ // Another exception: should we reaquire the lock?
+ std::terminate();
+ }
+ catch (...) {
+ std::terminate();
+ }
+}
+
+std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, double timeout_time)
+{
+ double now = SIMIX_get_clock();
+ double timeout;
+ if (timeout_time < now)
+ timeout = 0.0;
+ else
+ timeout = timeout_time - now;
+ return this->wait_for(lock, timeout);
}
/**
* Notify functions
*/
-void s4u::ConditionVariable::notify() {
+void ConditionVariable::notify_one() {
simcall_cond_signal(cond_);
}
-void s4u::ConditionVariable::notify_all() {
+void ConditionVariable::notify_all() {
simcall_cond_broadcast(cond_);
}
-
+}
+}
