XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ConditionVariable, simix_synchro, "Condition variables");
-static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer,
- smx_simcall_t simcall);
-
/********************************* Condition **********************************/
-/**
- * \brief Initialize a condition.
- *
- * Allocates and creates the data for the condition.
- * It have to be called before the use of the condition.
- * \return A condition
- */
-smx_cond_t SIMIX_cond_init()
+static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer,
+ smx_simcall_t simcall)
{
- XBT_IN("()");
- smx_cond_t cond = new simgrid::kernel::activity::ConditionVariableImpl();
+ XBT_IN("(%p, %p, %f, %p,%p)", cond, mutex, timeout, issuer, simcall);
+ smx_activity_t synchro = nullptr;
+
+ XBT_DEBUG("Wait condition %p", cond);
+
+ /* If there is a mutex unlock it */
+ /* FIXME: what happens if the issuer is not the owner of the mutex? */
+ if (mutex != nullptr) {
+ cond->mutex = mutex;
+ mutex->unlock(issuer);
+ }
+
+ synchro = SIMIX_synchro_wait(issuer->host, timeout);
+ synchro->simcalls.push_front(simcall);
+ issuer->waiting_synchro = synchro;
+ cond->sleeping.push_back(*simcall->issuer);
XBT_OUT();
- return cond;
}
/**
* \brief Handle a condition waiting simcall without timeouts
- * \param simcall the simcall
*/
void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
{
/**
* \brief Handle a condition waiting simcall with timeouts
- * \param simcall the simcall
*/
void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout)
{
XBT_OUT();
}
-static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer,
- smx_simcall_t simcall)
-{
- XBT_IN("(%p, %p, %f, %p,%p)", cond, mutex, timeout, issuer, simcall);
- smx_activity_t synchro = nullptr;
-
- XBT_DEBUG("Wait condition %p", cond);
-
- /* If there is a mutex unlock it */
- /* FIXME: what happens if the issuer is not the owner of the mutex? */
- if (mutex != nullptr) {
- cond->mutex = mutex;
- mutex->unlock(issuer);
- }
-
- synchro = SIMIX_synchro_wait(issuer->host, timeout);
- synchro->simcalls.push_front(simcall);
- issuer->waiting_synchro = synchro;
- cond->sleeping.push_back(*simcall->issuer);
- XBT_OUT();
-}
-
namespace simgrid {
namespace kernel {
namespace activity {
*
* Signalizes a condition and wakes up a sleeping process.
* If there are no process sleeping, no action is done.
- * \param cond A condition
*/
void ConditionVariableImpl::signal()
{
/* Now transform the cond wait simcall into a mutex lock one */
smx_simcall_t simcall = &proc.simcall;
- smx_mutex_t mutex;
+ smx_mutex_t simcall_mutex;
if (simcall->call == SIMCALL_COND_WAIT)
- mutex = simcall_cond_wait__get__mutex(simcall);
+ simcall_mutex = simcall_cond_wait__get__mutex(simcall);
else
- mutex = simcall_cond_wait_timeout__get__mutex(simcall);
+ simcall_mutex = simcall_cond_wait_timeout__get__mutex(simcall);
simcall->call = SIMCALL_MUTEX_LOCK;
- simcall_HANDLER_mutex_lock(simcall, mutex);
+ simcall_HANDLER_mutex_lock(simcall, simcall_mutex);
}
XBT_OUT();
}
} // namespace activity
} // namespace kernel
}
-
-XBT_PRIVATE void simcall_HANDLER_cond_signal(smx_simcall_t simcall, smx_cond_t cond)
-{
- cond->signal();
-}
-
-XBT_PRIVATE void simcall_HANDLER_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond)
-{
- cond->broadcast();
-}
