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
small simplification
[simgrid.git]
/
src
/
kernel
/
activity
/
ConditionVariableImpl.cpp
diff --git
a/src/kernel/activity/ConditionVariableImpl.cpp
b/src/kernel/activity/ConditionVariableImpl.cpp
index a46a9042ccc8866787519366780805ac4aa5c3fe..c29e907ec1978ae4df14887443385f213de19ebf 100644
(file)
--- a/
src/kernel/activity/ConditionVariableImpl.cpp
+++ b/
src/kernel/activity/ConditionVariableImpl.cpp
@@
-89,9
+89,6
@@
void ConditionVariableImpl::broadcast()
void ConditionVariableImpl::wait(smx_mutex_t mutex, double timeout, actor::ActorImpl* issuer, smx_simcall_t simcall)
{
void ConditionVariableImpl::wait(smx_mutex_t mutex, double timeout, actor::ActorImpl* issuer, smx_simcall_t simcall)
{
- XBT_IN("(%p, %p, %f, %p,%p)", this, mutex, timeout, issuer, simcall);
- RawImplPtr synchro = nullptr;
-
XBT_DEBUG("Wait condition %p", this);
/* If there is a mutex unlock it */
XBT_DEBUG("Wait condition %p", this);
/* If there is a mutex unlock it */
@@
-101,11
+98,11
@@
void ConditionVariableImpl::wait(smx_mutex_t mutex, double timeout, actor::Actor
mutex->unlock(issuer);
}
mutex->unlock(issuer);
}
- synchro = RawImplPtr(new RawImpl())->start(issuer->get_host(), timeout);
+ RawImplPtr synchro(new RawImpl());
+ (*synchro).set_host(issuer->get_host()).set_timeout(timeout).start();
synchro->simcalls_.push_front(simcall);
synchro->simcalls_.push_front(simcall);
- issuer->waiting_synchro = s
ynchro
;
+ issuer->waiting_synchro = s
td::move(synchro)
;
sleeping_.push_back(*simcall->issuer);
sleeping_.push_back(*simcall->issuer);
- XBT_OUT();
}
// boost::intrusive_ptr<ConditionVariableImpl> support:
}
// boost::intrusive_ptr<ConditionVariableImpl> support: