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
code simplification + replace a FIXME with an assert
[simgrid.git]
/
src
/
kernel
/
activity
/
ConditionVariableImpl.cpp
diff --git
a/src/kernel/activity/ConditionVariableImpl.cpp
b/src/kernel/activity/ConditionVariableImpl.cpp
index
c29e907
..
5efb83c
100644
(file)
--- a/
src/kernel/activity/ConditionVariableImpl.cpp
+++ b/
src/kernel/activity/ConditionVariableImpl.cpp
@@
-15,21
+15,13
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ConditionVariable, simix_synchro, "Condition var
/** @brief Handle a condition waiting simcall without timeouts */
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
/** @brief Handle a condition waiting simcall without timeouts */
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
- XBT_IN("(%p)", simcall);
- smx_actor_t issuer = simcall->issuer;
-
- cond->wait(mutex, -1, issuer, simcall);
- XBT_OUT();
+ cond->wait(mutex, -1, simcall->issuer_);
}
/** @brief Handle a condition waiting simcall with timeouts */
void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout)
{
}
/** @brief Handle a condition waiting simcall with timeouts */
void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout)
{
- XBT_IN("(%p)", simcall);
- smx_actor_t issuer = simcall->issuer;
- simcall_cond_wait_timeout__set__result(simcall, 0); // default result, will be set to 1 on timeout
- cond->wait(mutex, timeout, issuer, simcall);
- XBT_OUT();
+ cond->wait(mutex, timeout, simcall->issuer_);
}
namespace simgrid {
}
namespace simgrid {
@@
-61,13
+53,13
@@
void ConditionVariableImpl::signal()
/* Now transform the cond wait simcall into a mutex lock one */
smx_simcall_t simcall = &proc.simcall;
MutexImpl* simcall_mutex;
/* Now transform the cond wait simcall into a mutex lock one */
smx_simcall_t simcall = &proc.simcall;
MutexImpl* simcall_mutex;
- if (simcall->call == SIMCALL_COND_WAIT)
+ if (simcall->call
_
== SIMCALL_COND_WAIT)
simcall_mutex = simcall_cond_wait__get__mutex(simcall);
else
simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
simcall_mutex = simcall_cond_wait__get__mutex(simcall);
else
simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
- simcall->call = SIMCALL_MUTEX_LOCK;
+ simcall->call
_
= SIMCALL_MUTEX_LOCK;
- simcall_mutex->lock(simcall->issuer);
+ simcall_mutex->lock(simcall->issuer
_
);
}
XBT_OUT();
}
}
XBT_OUT();
}
@@
-87,22
+79,23
@@
void ConditionVariableImpl::broadcast()
signal();
}
signal();
}
-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)
{
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 */
- /* FIXME: what happens if the issuer is not the owner of the mutex? */
if (mutex != nullptr) {
if (mutex != nullptr) {
+ xbt_assert(mutex->owner_ == issuer,
+ "Actor %s cannot wait on ConditionVariable %p since it does not own the provided mutex %p",
+ issuer->get_cname(), this, mutex);
mutex_ = mutex;
mutex->unlock(issuer);
}
RawImplPtr synchro(new RawImpl());
mutex_ = mutex;
mutex->unlock(issuer);
}
RawImplPtr synchro(new RawImpl());
- (*synchro).set_host(issuer->get_host()).set_timeout(timeout).start();
- synchro->simcalls_.push_front(simcall);
- issuer->waiting_synchro = std::move(synchro);
- sleeping_.push_back(*simcall->issuer);
+ synchro->set_host(issuer->get_host()).set_timeout(timeout).start();
+ synchro->register_simcall(&issuer->simcall);
+ sleeping_.push_back(*issuer);
}
// boost::intrusive_ptr<ConditionVariableImpl> support:
}
// boost::intrusive_ptr<ConditionVariableImpl> support: