#ifndef SIMGRID_S4U_COND_VARIABLE_HPP
#define SIMGRID_S4U_COND_VARIABLE_HPP
-#include <simgrid/s4u/mutex.hpp>
+#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>
namespace simgrid {
namespace s4u {
class Mutex;
+/** A condition variable
+ *
+ * This is based on std::condition_variable and should respect the same
+ * semantic. But we currently use (only) double for both durations and
+ * timestamp timeouts.
+ */
XBT_PUBLIC_CLASS ConditionVariable {
public:
return cond_ != nullptr;
}
- /**
- * Wait functions
- */
- void wait(Mutex *mutex);
- void wait_for(Mutex *mutex, double time);
-
- /**
- * Notify functions
- */
- void notify();
+ // 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);
+
+ // Variants which takes a predicate:
+
+ template<class P>
+ void wait(std::unique_lock<Mutex>& lock, P pred)
+ {
+ while (!pred())
+ wait(lock);
+ }
+ template<class P>
+ bool wait_until(std::unique_lock<Mutex>& lock, double timeout_time, P pred)
+ {
+ while (!pred())
+ if (this->wait_until(lock, timeout_time) == std::cv_status::timeout)
+ return pred();
+ return true;
+ }
+ template<class P>
+ bool wait_for(std::unique_lock<Mutex>& lock, double duration, P pred)
+ {
+ return this->wait_until(lock, SIMIX_get_clock() + duration, std::move(pred));
+ }
+
+ // Notify functions
+
+ void notify_one();
void notify_all();
+ XBT_ATTRIB_DEPRECATED("Use notify_one() instead")
+ void notify() { notify_one(); }
+
private:
smx_cond_t cond_;
