X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ae4444e56c58d6a957263114cff7d81ff48f6a8..55b3e236db71d2245c71ff1ea3cbec120a0e0d8d:/src/s4u/s4u_conditionVariable.cpp

diff --git a/src/s4u/s4u_conditionVariable.cpp b/src/s4u/s4u_conditionVariable.cpp
index 60e336548e..3074f1253d 100644
--- a/src/s4u/s4u_conditionVariable.cpp
+++ b/src/s4u/s4u_conditionVariable.cpp
@@ -1,36 +1,90 @@
+#include <exception>
+#include <mutex>
+
+#include <xbt/ex.hpp>
+#include <xbt/log.hpp>
+
+#include "src/simix/smx_synchro_private.h"
 #include "simgrid/s4u/conditionVariable.hpp"
 #include "simgrid/simix.h"
 
-using namespace simgrid;
+namespace simgrid {
+namespace s4u {
 
-s4u::ConditionVariable::ConditionVariable()  : cond_(simcall_cond_init()){
-    
-}
-
-s4u::ConditionVariable::~ConditionVariable() {
-  SIMIX_cond_unref(cond_);
+ConditionVariablePtr ConditionVariable::createConditionVariable()
+{
+  smx_cond_t cond = simcall_cond_init();
+  return ConditionVariablePtr(&cond->cond_, false);
 }
 
 /**
  * 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) {
+  // The simcall uses -1 for "any timeout" but we don't want this:
+  if (timeout < 0)
+    timeout = 0.0;
+
+  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_);
 }
 
- 
+void intrusive_ptr_add_ref(ConditionVariable* cond)
+{
+  intrusive_ptr_add_ref(cond->cond_);
+}
+
+void intrusive_ptr_release(ConditionVariable* cond)
+{
+  intrusive_ptr_release(cond->cond_);
+}
+
+}
+}