-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#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/chrono.hpp>
#include <simgrid/s4u/Mutex.hpp>
-#include <simgrid/simix.h>
+
+#include <future>
namespace simgrid {
namespace s4u {
* semantic. But we currently use (only) double for both durations and
* timestamp timeouts.
*/
-XBT_PUBLIC_CLASS ConditionVariable
-{
+class XBT_PUBLIC ConditionVariable {
private:
- friend s_smx_cond;
- smx_cond_t cond_;
- ConditionVariable(smx_cond_t cond) : cond_(cond) {}
+ friend simgrid::kernel::activity::ConditionVariableImpl;
+ simgrid::kernel::activity::ConditionVariableImpl* const cond_;
+
+ explicit ConditionVariable(simgrid::kernel::activity::ConditionVariableImpl* cond) : cond_(cond) {}
+
public:
ConditionVariable(ConditionVariable const&) = delete;
ConditionVariable& operator=(ConditionVariable const&) = delete;
- 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>;
+ friend XBT_PUBLIC void intrusive_ptr_add_ref(ConditionVariable * cond);
+ friend XBT_PUBLIC void intrusive_ptr_release(ConditionVariable * cond);
+
+ static ConditionVariablePtr create();
- static Ptr createConditionVariable();
+#ifndef DOXYGEN
+ /** @deprecated See Comm::get_mailbox() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use ConditionVariableImpl::create()") ConditionVariablePtr
+ createConditionVariable()
+ {
+ return create();
+ }
+#endif
// Wait functions without time:
void wait(std::unique_lock<Mutex> & lock);
template <class P> void wait(std::unique_lock<Mutex> & lock, P pred)
{
- while (!pred())
+ while (not pred())
wait(lock);
}
std::cv_status wait_for(std::unique_lock<Mutex> & lock, double duration);
template <class P> bool wait_until(std::unique_lock<Mutex> & lock, double timeout_time, P pred)
{
- while (!pred())
+ while (not pred())
if (this->wait_until(lock, timeout_time) == std::cv_status::timeout)
return pred();
return true;
void notify_one();
void notify_all();
-
- XBT_ATTRIB_DEPRECATED("Use notify_one() instead")
- void notify() { notify_one(); }
};
-using ConditionVariablePtr = ConditionVariable::Ptr;
}
} // namespace simgrid::s4u