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
Fix clang builds
[simgrid.git]
/
src
/
kernel
/
actor
/
SynchroObserver.hpp
diff --git
a/src/kernel/actor/SynchroObserver.hpp
b/src/kernel/actor/SynchroObserver.hpp
index
7c5ddc0
..
ffcfcab
100644
(file)
--- a/
src/kernel/actor/SynchroObserver.hpp
+++ b/
src/kernel/actor/SynchroObserver.hpp
@@
-81,17
+81,18
@@
public:
double get_timeout() const { return timeout_; }
};
double get_timeout() const { return timeout_; }
};
-class Condition
WaitSimcall
final : public ResultingSimcall<bool> {
- mc::Transition::Type type_;
+class Condition
VariableObserver
final : public ResultingSimcall<bool> {
+ //mc::Transition::Type type_; Will be used when we implement CV on the MC side
activity::ConditionVariableImpl* const cond_;
activity::MutexImpl* const mutex_;
const double timeout_;
public:
activity::ConditionVariableImpl* const cond_;
activity::MutexImpl* const mutex_;
const double timeout_;
public:
- Condition
WaitSimcall
(ActorImpl* actor, activity::ConditionVariableImpl* cond, activity::MutexImpl* mutex,
- double timeout = -1.0)
+ Condition
VariableObserver
(ActorImpl* actor, activity::ConditionVariableImpl* cond, activity::MutexImpl* mutex,
+
double timeout = -1.0)
: ResultingSimcall(actor, false), cond_(cond), mutex_(mutex), timeout_(timeout)
{
: ResultingSimcall(actor, false), cond_(cond), mutex_(mutex), timeout_(timeout)
{
+ xbt_assert(mutex != nullptr, "Cannot wait on a condition variable without a valid mutex");
}
void serialize(std::stringstream& stream) const override;
std::string to_string() const override;
}
void serialize(std::stringstream& stream) const override;
std::string to_string() const override;