X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f0790965ada172e7ac96eb848759e02f7fbc8ca..0f85c75558b648a231f53f4dba18cc6788858b10:/include/simgrid/s4u/conditionVariable.hpp

diff --git a/include/simgrid/s4u/conditionVariable.hpp b/include/simgrid/s4u/conditionVariable.hpp
index 4d59c280be..2db6fb8f9d 100644
--- a/include/simgrid/s4u/conditionVariable.hpp
+++ b/include/simgrid/s4u/conditionVariable.hpp
@@ -6,10 +6,16 @@
 #ifndef SIMGRID_S4U_COND_VARIABLE_HPP
 #define SIMGRID_S4U_COND_VARIABLE_HPP
 
+#include <chrono>
 #include <condition_variable>
+#include <future>
 #include <mutex>
 #include <utility> // std::swap
 
+#include <boost/intrusive_ptr.hpp>
+
+#include <xbt/base.h>
+
 #include <simgrid/simix.h>
 #include <simgrid/s4u/mutex.hpp>
 
@@ -25,41 +31,48 @@ class Mutex;
  *  timestamp timeouts.
  */
 XBT_PUBLIC_CLASS ConditionVariable {
-  
+private:
+  friend s_smx_cond;
+  smx_cond_t cond_;
+  ConditionVariable(smx_cond_t cond) : cond_(cond) {}
 public:
-  ConditionVariable();
 
-  ConditionVariable(ConditionVariable* cond) : cond_(SIMIX_cond_ref(cond->cond_)) {}
-  ~ConditionVariable();
+  ConditionVariable(ConditionVariable const&) = delete;
+  ConditionVariable& operator=(ConditionVariable const&) = delete;
 
-  // Copy+move (with the copy-and-swap idiom):
-  ConditionVariable(ConditionVariable const& cond) : cond_(SIMIX_cond_ref(cond.cond_)) {}
-  friend void swap(ConditionVariable& first, ConditionVariable& second)
-  {
-    using std::swap;
-    swap(first.cond_, second.cond_);
-  }
-  ConditionVariable& operator=(ConditionVariable cond)
-  {
-    swap(*this, cond);
-    return *this;
-  }
-  ConditionVariable(ConditionVariable&& cond) : cond_(nullptr)
-  {
-    swap(*this, cond);
-  }
+  friend XBT_PUBLIC(void) intrusive_ptr_add_ref(ConditionVariable* cond);
+  friend XBT_PUBLIC(void) intrusive_ptr_release(ConditionVariable* cond);
+  using Ptr = boost::intrusive_ptr<ConditionVariable>;
+
+  static Ptr createConditionVariable();
 
-  bool valid() const
-  {
-    return cond_ != nullptr;
-  }
-  
   //  Wait functions:
 
   void wait(std::unique_lock<Mutex>& lock);
   std::cv_status wait_until(std::unique_lock<Mutex>& lock, double timeout_time);
   std::cv_status wait_for(std::unique_lock<Mutex>& lock, double duration);
 
+  /** Wait for a given duraiton
+   *
+   *  This version gives us the ability to do (in C++):
+   *
+   *  <code>
+   *  using namespace std::literals::chrono_literals;
+   *
+   *  cond->wait_for(lock, 1ms);
+   *  cond->wait_for(lock, 1s);
+   *  cond->wait_for(lock, 1min);
+   *  cond->wait_for(lock, 1h);
+   *  </code>
+   */
+  template<class Rep, class Period>
+  std::cv_status wait_for(std::unique_lock<Mutex>& lock, std::chrono::duration<Rep, Period> duration)
+  {
+    typedef std::chrono::duration<double> SecondsDouble;
+    auto seconds = std::chrono::duration_cast<SecondsDouble>(duration);
+    return this->wait_for(lock, duration.count());
+  }
+
   // Variants which takes a predicate:
 
   template<class P>
@@ -81,6 +94,13 @@ public:
   {
     return this->wait_until(lock, SIMIX_get_clock() + duration, std::move(pred));
   }
+  template<class Rep, class Period, class P>
+  bool wait_for(std::unique_lock<Mutex>& lock, std::chrono::duration<Rep, Period> duration, P pred)
+  {
+    typedef std::chrono::duration<double> SecondsDouble;
+    auto seconds = std::chrono::duration_cast<SecondsDouble>(duration);
+    return this->wait_for(lock, seconds.count(), pred);
+  }
 
   // Notify functions
 
@@ -89,11 +109,10 @@ public:
 
   XBT_ATTRIB_DEPRECATED("Use notify_one() instead")
   void notify() { notify_one(); }
+};
 
-private:
-  smx_cond_t cond_;
+using ConditionVariablePtr = ConditionVariable::Ptr;
 
-};
 }} // namespace simgrid::s4u
 
 #endif /* SIMGRID_S4U_COND_VARIABLE_HPP */