move parts of the kernel to the right subdir

[simgrid.git] / src / s4u / s4u_conditionVariable.cpp

diff --git a/src/s4u/s4u_conditionVariable.cpp b/src/s4u/s4u_conditionVariable.cpp
index 52b5b90..3074f12 100644 (file)
--- a/src/s4u/s4u_conditionVariable.cpp
+++ b/src/s4u/s4u_conditionVariable.cpp
@@ -1,20 +1,20 @@
 #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"
 
 namespace simgrid {
 namespace s4u {
 
-ConditionVariable::ConditionVariable()  : cond_(simcall_cond_init()){
-    
-}
-
-ConditionVariable::~ConditionVariable() {
-  SIMIX_cond_unref(cond_);
+ConditionVariablePtr ConditionVariable::createConditionVariable()
+{
+  smx_cond_t cond = simcall_cond_init();
+  return ConditionVariablePtr(&cond->cond_, false);
 }
 
 /**
@@ -25,6 +25,10 @@ void ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
 }
 
 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;
@@ -72,5 +76,15 @@ 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_);
+}
+
 }
 }