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
Rename the CondVar observer as it should
[simgrid.git]
/
src
/
kernel
/
actor
/
SynchroObserver.cpp
diff --git
a/src/kernel/actor/SynchroObserver.cpp
b/src/kernel/actor/SynchroObserver.cpp
index
1dff82a
..
50a4ce3
100644
(file)
--- a/
src/kernel/actor/SynchroObserver.cpp
+++ b/
src/kernel/actor/SynchroObserver.cpp
@@
-106,7
+106,7
@@
bool BarrierObserver::is_enabled()
(type_ == mc::Transition::Type::BARRIER_WAIT && acquisition_ != nullptr && acquisition_->granted_);
}
(type_ == mc::Transition::Type::BARRIER_WAIT && acquisition_ != nullptr && acquisition_->granted_);
}
-bool Condition
WaitSimcall
::is_enabled()
+bool Condition
VariableObserver
::is_enabled()
{
if (static bool warned = false; not warned) {
XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
{
if (static bool warned = false; not warned) {
XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
@@
-114,11
+114,11
@@
bool ConditionWaitSimcall::is_enabled()
}
return true;
}
}
return true;
}
-void Condition
WaitSimcall
::serialize(std::stringstream& stream) const
+void Condition
VariableObserver
::serialize(std::stringstream& stream) const
{
THROW_UNIMPLEMENTED;
}
{
THROW_UNIMPLEMENTED;
}
-std::string Condition
WaitSimcall
::to_string() const
+std::string Condition
VariableObserver
::to_string() const
{
return "ConditionWait(cond_id:" + ptr_to_id<activity::ConditionVariableImpl const>(get_cond()) +
" mutex_id:" + std::to_string(get_mutex()->get_id()) + ")";
{
return "ConditionWait(cond_id:" + ptr_to_id<activity::ConditionVariableImpl const>(get_cond()) +
" mutex_id:" + std::to_string(get_mutex()->get_id()) + ")";