A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve doc to avoid mixture between Comm::set_src_data_size() and Activity::set_rema...
[simgrid.git]
/
include
/
simgrid
/
s4u
/
ConditionVariable.hpp
diff --git
a/include/simgrid/s4u/ConditionVariable.hpp
b/include/simgrid/s4u/ConditionVariable.hpp
index
5efc7f9
..
12e0be1
100644
(file)
--- a/
include/simgrid/s4u/ConditionVariable.hpp
+++ b/
include/simgrid/s4u/ConditionVariable.hpp
@@
-6,19
+6,10
@@
#ifndef SIMGRID_S4U_COND_VARIABLE_HPP
#define SIMGRID_S4U_COND_VARIABLE_HPP
#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/chrono.hpp>
#include <simgrid/s4u/Mutex.hpp>
-#include <simgrid/simix.h>
+
+#include <future>
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
@@
-30,11
+21,11
@@
namespace s4u {
* semantic. But we currently use (only) double for both durations and
* timestamp timeouts.
*/
* semantic. But we currently use (only) double for both durations and
* timestamp timeouts.
*/
-XBT_PUBLIC_CLASS ConditionVariable
-{
+class XBT_PUBLIC ConditionVariable {
private:
private:
- friend s
_smx_cond_t
;
+ friend s
imgrid::kernel::activity::ConditionVariableImpl
;
smx_cond_t cond_;
smx_cond_t cond_;
+
explicit ConditionVariable(smx_cond_t cond) : cond_(cond) {}
public:
ConditionVariable(ConditionVariable const&) = delete;
explicit ConditionVariable(smx_cond_t cond) : cond_(cond) {}
public:
ConditionVariable(ConditionVariable const&) = delete;
@@
-42,9
+33,14
@@
public:
friend XBT_PUBLIC void intrusive_ptr_add_ref(ConditionVariable * cond);
friend XBT_PUBLIC void intrusive_ptr_release(ConditionVariable * 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();
+ static ConditionVariablePtr create();
+
+ /** @deprecated See Comm::get_mailbox() */
+ XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") ConditionVariablePtr createConditionVariable()
+ {
+ return create();
+ }
// Wait functions without time:
// Wait functions without time:
@@
-105,7
+101,6
@@
public:
void notify_all();
};
void notify_all();
};
-using ConditionVariablePtr = ConditionVariable::Ptr;
}
} // namespace simgrid::s4u
}
} // namespace simgrid::s4u